Update potfiles wrt recent changes, regenerate translations

24 files changed, 16353 insertions, 16473 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 710578523..d3b29fbde 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ lib/depends.c
 lib/formats.c
 lib/fs.c
 lib/fsm.c
+lib/legacy.c
 lib/manifest.c
 lib/misc.c
 lib/package.c
@@ -52,7 +53,6 @@ lib/rpmte.c
 lib/rpmts.c
 lib/rpmvercmp.c
 lib/signature.c
-lib/stringbuf.c
 lib/transaction.c
 lib/verify.c
 misc/error.c
@@ -62,7 +62,6 @@ rpmdb/fprint.c
 rpmdb/hdrNVR.c
 rpmdb/header.c
 rpmdb/header_internal.c
-rpmdb/legacy.c
 rpmdb/merge.c
 rpmdb/poptDB.c
 rpmdb/rpmdb.c
@@ -78,7 +77,7 @@ rpmio/rpmio.c
 rpmio/rpmlog.c
 rpmio/rpmmalloc.c
 rpmio/rpmpgp.c
-rpmio/rpmrpc.c
+rpmio/rpmstring.c
 rpmio/rpmsq.c
 rpmio/rpmsw.c
 rpmio/ugid.c
diff --git a/po/ca.po b/po/ca.po
index 5cce3b063..9436a0274 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2007-10-13 14:46+0200\n"
 "Last-Translator: Catalan <fedora@softcatala.net>\n"
 "Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -30,51 +30,51 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Han fallat les dependències de muntatge:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "No s'ha pogut obrir el fitxer d'especificacions %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "No s'ha pogut obrir un conducte per al tar: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "No s'ha pogut llegir el fitxer d'especificacions des de %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "No s'ha pogut canviar el nom de %s per %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "No s'ha pogut obtenir l'estat de %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "El fitxer %s no és un fitxer regular.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "El fitxer %s no sembla un fitxer d'especificacions.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "S'estan muntant les plataformes destí: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "S'està muntant per al destí %s\n"
@@ -94,60 +94,60 @@ 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 la càrrega de dades: %s\n"
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Opcions de consulta (amb -q o --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Opcions de verificació (amb -V o --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr "Opcions d'origen (amb --query o --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr "Opcions per recórrer l'arbre de fitxers (amb --ftswalk)"
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Opcions de la signatura:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Opcions de la base de dades:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Opcions de muntatge amb [ <fitxer d'especificacions> | <arxiu tar> | <paquet "
 "font> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opcions d'instal·lació/actualització/supressió:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opcions comunes per a tots els modes d'rpm i executables:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "Versió de l'RPM %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (c) 1998 - 2002 Red Hat, Inc.\n"
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -155,131 +155,131 @@ msgstr ""
 "Aquest programari es pot distribuir lliurement d'acord amb els termes de la "
 "Llicència Pública General GNU\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "S'ha produït un error intern en el processament d'arguments (%d)\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "només es pot especificar un mode principal"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "indicadors inesperats de la consulta"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "format inesperat de la consulta"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "font inesperada de la consulta"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "només es poden imposar la instal·lació, l'actualització, l'rmsource i "
 "l'rmspec"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 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:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "no es pot utilitzar l'opció --prefix amb --relocate o --excludepath"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 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:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "els arguments a --prefix han de començar amb una /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 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:425
+#: rpmqv.c:420
 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:429
+#: rpmqv.c:424
 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:433
+#: rpmqv.c:428
 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:437
+#: rpmqv.c:432
 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:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "només es pot especificar una opció entre --excludedocs i --includedocs"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 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:449
+#: rpmqv.c:444
 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:454
+#: rpmqv.c:449
 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:458
+#: rpmqv.c:453
 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:462
+#: rpmqv.c:457
 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:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -287,7 +287,7 @@ msgstr ""
 "només es poden especificar les opcions d'inhabilitació d'scripts durant la "
 "instal·lació i supressió d'un paquet"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -295,7 +295,7 @@ msgstr ""
 "només es poden especificar les opcions d'inhabilitació de l'activador durant "
 "la instal·lació i supressió d'un paquet"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -304,7 +304,7 @@ msgstr ""
 "reconstrucció, la recompilació, la instal·lació, la supressió i la "
 "verificació d'un paquet"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -312,7 +312,7 @@ msgstr ""
 "només es pot especificar l'opció --test durant la instal·lació, la supressió "
 "i el muntatge d'un paquet"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -320,105 +320,105 @@ msgstr ""
 "només es pot especificar l'opció --root (-r) durant la instal·lació, "
 "supressió, consulta i reconstrucció d'una base de dades"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "els arguments a --root (-r) han de començar per /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "cap fitxer per signar\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "no s'ha pogut accedir al fitxer %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "no s'ha trobat pgp:"
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Introduïu la contrasenya:"
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "La verificació de la contrasenya ha fallat\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "La contrasenya és correcta.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "L'especificació de %%_signature al fitxer macro no és vàlida.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "només es pot utilitzar l'opció --sign durant el muntatge d'un paquet"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "ha fallat l'execució\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "no s'han donat fitxers de paquets per a reconstruir"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "no s'han donat fitxers d'especificacions per a muntar"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "no s'han donat fitxers tar per a muntar"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "no s'han donat paquets per a suprimir"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "no s'han donat paquets per a instal·lar"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "no s'han donat arguments per a consultar"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "no s'han donat arguments per a verificar"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "no s'han donat arguments"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "No s'ha pogut obrir el fitxer temporal.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Executant(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Ha fallat l'execució de %s (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "L'estat de sortida de %s (%s) és erroni\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -477,92 +477,92 @@ msgstr "&& i || no són disponibles per a les cadenes\n"
 msgid "syntax error in expression\n"
 msgstr "error de sintaxi a l'expressió\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "Error del TIMECHECK: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Manca '(' a %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Manca ')' a %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "L'element %s no és vàlid: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Manca %s a %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() va seguit d'un caràcter que no és un espai en blanc: %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Sintaxi incorrecta: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "La longitud del locale és inhabitual: \"%.*s\" a %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Locale %.*s duplicat a %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "S'ha arribat al límit per a %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Només un argument per a %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dos fitxers en una línia: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "El fitxer ha de començar amb  \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "No es pot mesclar el %%doc especial amb altres formularis: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr "_docdir_fmt no és vàlid: %s\n"
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "El fitxer apareix dues vegades: %s\n"
@@ -592,7 +592,7 @@ msgstr "%s: no es pot carregar l'etiqueta incorrecta (%d).\n"
 msgid "%s: public key read failed.\n"
 msgstr "%s: ha fallat la clau pública.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -612,7 +612,7 @@ msgstr "El fitxer ha de començar amb \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "No es permet el glob: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "El glob no ha trobat el fitxer: %s\n"
@@ -622,7 +622,7 @@ msgstr "El glob no ha trobat el fitxer: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "No s'ha pogut obrir el fitxer %%files %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "línia: %s\n"
@@ -632,7 +632,7 @@ msgstr "línia: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Fitxer no vàlid: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Propietari/grup incorrecte: %s\n"
@@ -656,181 +656,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "S'està processant els fitxers: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: massa uid\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: massa uid\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: massa uid\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: massa gid\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: massa gid\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: massa gid\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "El nom de màquina no es pot fer canònic: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "ha fallat la creació de l'arxiu en el fitxer %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "ha fallat la creació d'un arxiu: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "Ha fallat l'escriptura del cpio_copy: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "ha fallat la lectura de cpio_copy: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "No s'ha pogut obrir el fitxer a PreIn: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "No s'ha pogut obrir el fitxer a PreUn: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "No s'ha pogut obrir el fitxer PostIn: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "No s'ha pogut obrir el fitxer PostUn: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "No s'ha pogut obrir el fitxer VerifyScript: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "No s'ha pogut obrir el fitxer d'script de Trigger: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: obre %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: llegeix %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ha fallat l'fseek: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s no és un paquet RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: s'està llegint la capçalera de %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "No es pot crear la regió de capçalera no modificable.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "No s'ha pogut escriure la capçalera temporal\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Dades CSA invàlides\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "No es pot escriure la capçalera final\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "S'està generant la signatura: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "No es pot tornar a carregar la capçalera de signatura.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "No es pot obrir %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No es pot escriure el paquet: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "No es pot llegir la capçalera de %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "No es pot escriure la capçalera a %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "No s'ha pogut llegir la càrrega de %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No s'ha pogut escriure la càrrega de %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "S'ha escrit: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "No es pot generar el nom de fitxer de sortida per al paquet %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "no es pot crear %s: %s\n"
@@ -840,32 +831,32 @@ msgstr "no es pot crear %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "línia %d: segon %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "les entrades del %%changelog han de començar amb *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "l'entrada de %%changelog no és completa\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "la data de %%changelog no és correcta: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "el %%changelog no està en ordre cronològic descendent\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "manca el nom a %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "no hi ha descripció a %%changelog\n"
@@ -875,17 +866,17 @@ msgstr "no hi ha descripció a %%changelog\n"
 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:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "línia %d: opció incorrecta %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "línia %d: massa noms: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "línia %d: no existeix Package: %s\n"
@@ -895,210 +886,210 @@ msgstr "línia %d: no existeix Package: %s\n"
 msgid "line %d: Second description\n"
 msgstr "línia %d: segona descripció\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "línia %d: s'ha produït un error en analitzar %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "línia %d: segona llista de %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "S'ha exclòs l'arquitectura: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "No s'inclou l'arquitectura: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "S'ha exclòs el SO: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "No s'ha inclòs el SO: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "El camp %s ha de ser present al paquet: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "L'entrada %s és duplicada al paquet: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "No s'ha pogut obrir la icona %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "No s'ha pogut llegir la icona %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "El tipus d'icona és desconegut: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "línia %d: l'etiqueta és malament formada: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "línia %d: l'etiqueta és buida: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "línia %d: caràcter «-» no permès a %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "«BuildRoot» no pot ser <«/»: %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, 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:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "línia %d: el camp Epoch/Serial ha d'ésser un nombre: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "línia %d: %s és incorrecte: qualificadors: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, 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:661
+#: build/parsePreamble.c:659
 #, 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:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr "La sintaxi antiga no és disponible: %s\n"
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "L'especificació del paquet és incorrecta: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "El paquet ja existeix: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "línia %d: l'etiqueta és desconeguda: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "El fitxer d'especificació no pot utilitzar «BuildRoot»\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "La font és incorrecta: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Ni hi ha cap número de pedaç %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "No hi ha cap número de font %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "No s'ha pogut baixar «nosource» %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Hi ha hagut un error en analitzar %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "línia %d: l'argument a %%setup és incorrecte: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "línia %d: l'opció de %%setup %s és incorrecta: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "línia %d: es necessita un argument per a %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "línia %d: es necessita un argument per a %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "línia %d: l'argument per a %%patch -F és incorrecte: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "línia %d: es necessita un argument per a %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "línia %d: l'argument a %%patch -p és incorrecte: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Hi ha massa pedaços\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "línia %d: l'argument a %%patch és incorrecte: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "línia %d: segon %%prep\n"
@@ -1151,298 +1142,302 @@ msgstr "línia %d: Segon %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "línia %d: l'script intern no està disponible: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "línia %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "No es pot obrir %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if sense tancar\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean retorna %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "sentència %%include mal formada\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "No s'ha trobat cap arquitectura compatible per al muntatge\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "El paquet no té %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "el buildroot ja s'ha especificat, s'està ignorant %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "munta amb %prep (desempaqueta els fonts i aplica els pedaços) des del "
 "<fitxer d'especificació>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<fitxer d'especificació>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 "munta amb %build (%prep, després compila) des del <fitxer d'especificació>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "munta amb %install (%prep, %build i després instal·la) des del <fitxer "
 "d'especificació>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "verifica la secció %files de <fitxer d'especificació>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "munta els paquets de codi font i binaris de <fitxer d'especificació>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "munta només el paquet binari de <fitxer d'especificació>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "munta només el paquet font de <fitxer d'especificació>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "munta amb %prep (desempaqueta els fonts i aplica els pedaços) des de "
 "l'<arxiu tar>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<arxiu tar>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "munta amb %build (%prep, després compila) des de l'<arxiu tar>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "munta amb %install (%prep, %build, instal·la) des de l'<arxiu tar>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verifica la secció %files des de l'<arxiu tar>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "munta els paquets font i binari des de l'<arxiu tar>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "munta el paquet binari des de l'<arxiu tar> només"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "munta els paquets font només des de l'<arxiu tar>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "munta els paquets binaris des de <paquet font>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<paquet font>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr "munta amb %install (%prep, %build i instal·la) des del <paquet font>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr ""
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "suprimeix l'arbre del muntatge en acabar"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "genera capçaleres compatibles amb l'empaquetament rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignora ExcludeArch: directives del fitxer d'especificació"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "depura la màquina d'estat de fitxers"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "no executis cap fase del muntatge"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "no verifiquis les dependències del muntatge"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "genera les capçaleres de paquets compatibles amb l'antic empaquetament rpm2 "
 "i 3"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "no verifiquis les capçaleres de la base de dades en obtenir-les"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "no verifiquis les signatures del paquet"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "no acceptis els msgstr d'i18N des d'un fitxer d'especificació"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "suprimeix els fonts en acabar"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "suprimeix el fitxer d'especificació en acabar"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "vés directament a l'etapa especificada (només per a c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "genera la signatura PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr ""
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "cerca cadenes traduïdes en el catàleg del fitxer d'especificació"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "genera capçaleres compatibles amb l'empaquetat antic rpm2 i 3"
+
+#: build/rpmfc.c:122
 #, fuzzy, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "No es pot executar %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "No s'ha pogut crear el procés fill de «%s»: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, fuzzy, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr "%s: waitpid(%d) rc %d estat %x segs %u.%03u\n"
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "ha fallat %s: %s\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "No s'ha pogut escriure la càrrega de %s: %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "ha fallat l'apertura de %s: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "ha fallat la lectura de cpio_copy: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Fitxer %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "No es pot llegir %s: %s.\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "línia %d: número incorrecte: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "línia %d: número %s incorrecte: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "no es pot consultar %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1489,77 +1484,77 @@ msgstr "El fitxer de l'arxiu no és a la capçalera"
 msgid " failed - "
 msgstr " ha fallat - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "el paquet %s ja s'ha afegit, s'està ignorant %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "el paquet %s ja es va afegir, s'està reemplaçant per %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr "  Fa obsolet: %s\t\tsuprimeix %s\n"
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(a la memòria cau)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignora les relacions del noms de paquets [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "s'està suprimint %s «%s» de les relacions d'ordenació.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== s'està gravant les relacions d'ordenació\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== només els successors (%d bytes)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "Bucle:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== s'està continuant l'ordenació ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "ha fallat rpmtsOrder, manquen %d elements\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(no és una xifra)"
 
@@ -1571,15 +1566,15 @@ msgstr "(no és base64)"
 msgid "(invalid type)"
 msgstr "(tipus invàlid)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(no és un blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(tipus d'XML invàlid)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(no és una signatura d'OpenPGP)"
 
@@ -1598,7 +1593,7 @@ msgstr "mntctl() no ha retornat els punts de muntatge: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "no s'ha obtingut l'estat de %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
@@ -1613,11 +1608,11 @@ msgstr "%5d 0x%04x %s %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "el fitxer %s és en un dispositiu desconegut\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== Directoris no inclosos explícitament en el paquet:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1673,51 +1668,46 @@ msgstr "%s la supressió de %s ha fallat: %s \n"
 msgid "%s created as %s\n"
 msgstr "%s creat com a %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "S'estan afegint %d arguments del manifest.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "no es pot crear %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "no es pot escriure a %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "s'ha produït un error en crear el fitxer temporal %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "mida del blob(%d): dolenta, 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 "etiqueta[%d]: dolenta, etiqueta %d tipus %d desplaçament %d compte %d\n"
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 "desplaçament de regió: dolent, etiqueta %d tipus %d desplaçament %d compte %"
 "d\n"
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 "tros de regió: dolenta, etiqueta %d tipus %d desplaçament %d compte %d\n"
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "la dimensió de la regió:  dolenta, ril(%d) > il(%d)\n"
@@ -1773,179 +1763,178 @@ msgstr "capçalera blob(%d): dolenta, la lectura ha retornat %d\n"
 msgid "hdr load: BAD\n"
 msgstr "càrrega de la capçalera: dolenta\n"
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "aquesta versió d'RPM no implementa l'empaquetament de la versió 1\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "aquesta versió d'RPM només permet empaquetar amb valors <=4\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: El rpmReadSignature ha fallat: %s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: No hi ha signatura disponible\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: El headerRead ha fallat: %s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr "s'està ignorant el paquet %s amb signatura no verificable V%u\n"
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: El Fread ha fallat: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s és un Delta RPM i no es pot instal·lar directament\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "La càrrega de dades (%s) no és disponible al paquet %s\n"
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+#, fuzzy
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "FTS_COMFOLLOW: segueix els enllaços simbòlics de la línia d'ordres"
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+#, fuzzy
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "FTS_LOGICAL: camí lògic"
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+#, fuzzy
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "FTS_NOCHDIR: no canviïs als directoris"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+#, fuzzy
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "FTS_NOSTAT: no adquireixis informació d'estat"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+#, fuzzy
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "FTS_PHYSICAL: camí físic"
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+#, fuzzy
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "FTS_SEEDOT: retorna punt i punt-punt"
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+#, fuzzy
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "FTS_XDEV: no creuis dispositius"
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+#, fuzzy
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "FTS_WHITEOUT: retorn sense informació"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "predefineix MACRO amb el valor EXPR"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "defineix la MACRO amb el valor EXPR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "imprimeix l'expansió de la macro de l'EXPR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "llegeix <FILE:...> en comptes dels fitxers per defecte"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<FITXER:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "inhabilita l'ús de libio(3) API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "envia de la sortida estàndard a CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "utilitza ROOT com a directori d'alt nivell"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "mostra etiquetes de consulta conegudes"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "mostra rpmrc final i la configuració de macros"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "proporciona sortides menys detallades"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "proporciona sortides més detallades"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "escriu la versió d'RPM que s'està usant"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "depura la màquina d'estats del fitxer de càrrega de dades"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr "empra fluxos per a la màquina d'estat de fitxers"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "depura el processament d'opcions/arguments"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "depura la màquina d'estat de paquets"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr "usa fluxos per a la màquina d'estat de paquets"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "depura l'E/S de l'rpmio"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "depura la gestió de la memòria cau d'URL"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: la taula d'opcions no està ben configurada (%d)\n"
@@ -2371,7 +2360,7 @@ msgstr "no comprovis els contextos de seguretat dels fitxers"
 msgid "don't verify files in package"
 msgstr "no comprovis els fitxers del paquet"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "no comprovis les relacions de dependència del paquet"
 
@@ -2411,100 +2400,100 @@ msgstr "signa els paquets (igual que --addsign)"
 msgid "generate signature"
 msgstr "genera la signatura"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "s'espera un paquet de codi font, però s'ha trobat un de binari\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "el paquet font no conté un fitxer .spec\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rc %d estat %x segs %u.%03u\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s.%s) s'està executant l'scriptlet <lua>.\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s.%s) s'està ignorant el «%s» redundant.\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s.%s) s'ha iniciat l'scriptlet %ssíncron\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "Ha fallat l'scriptlet %s(%s-%s-%s.%s), waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "Ha fallat l'scriptlet %s(%s-%s-%s.%s), el senyal és %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "Ha fallat l'scriptlet %s(%s-%s-%s.%s), l'estat de sortida és %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s té %d fitxers, prova = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: l'scriptlet %s ha fallat (%d), s'està ignorant %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "No es pot tornar a carregar la capçalera de la signatura\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ha fallat el desempaquetat de l'arxiu%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " al fitxer "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "ha fallat %s al fitxer %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "ha fallat %s: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 "S'està intentant marcar %s com a instal·lat a la taula de puntuacions(%p).\n"
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 "S'està intentant marcar %s com a esborrat a la taula de puntuació(%p).\n"
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "format incorrecte: %s\n"
@@ -2605,126 +2594,107 @@ msgstr "número de registre de paquet: %u\n"
 msgid "record %u could not be read\n"
 msgstr "el registre %u no es pot llegir\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "no s'ha instal·lat el paquet %s\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(fitxers afegits)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ha fallat l'apertura: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "ha fallat makeTempFile\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: ha fallat l'Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: ha fallat l'Fflush: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: no és un paquet rpm\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: no es pot signar un empaquetat v1\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: no es pot tornar a signar un empaquetat v2\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: ja va ser signat per la clau amb ID %s, s'està ignorant\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ha fallat writeLead: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ha fallat rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: ha fallat la lectura de la importació (%d).\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: ha fallat la importació.\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: ha fallat headerRead\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: ha fallat headerGetEntry\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: cap signatura disponible (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NO ÉS CORRECTE"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (CLAUS NO TROBADES:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CLAUS NO FIABLES:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "D'ACORD"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NO "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "SÍ"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2734,71 +2704,67 @@ msgstr ""
 "\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "el paquet %s no ha satisfet %s: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s s'ha ignorat perquè manca el senyalador missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== reubicacions\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d exclou  %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d reubica %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "s'està excloent %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "s'està reubicant %s a %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "s'està reubicant el directori %s a %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "ha fallat l'apertura de %s: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "etiqueta desconeguda: «%s»\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Dependències fallides:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    Resolucions suggerides:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "S'està preparant..."
@@ -2823,105 +2789,120 @@ msgstr "S'està actualitzant..."
 msgid "Upgrading packages..."
 msgstr "S'està actualitzant els paquets..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "S'està afegint un objectiu: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... com a %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "s'està ignorant %s - ha fallat la transferència - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "no es pot instal·lar %s\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "\ts'ha afegit el paquet font [%d]\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr "el paquet %s no és reubicable\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "\ts'ha afegit el paquet binari [%d]\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "s'ha produït un error en llegir del fitxer %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "el fitxer %s necessita una nova versió d'RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: no és un paquet rpm (o un manifest de paquet): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "s'ha trobat %d paquets font i %d paquets binaris\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "s'està instal·lant els paquets binaris\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "no es pot obrir el fitxer %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "«%s» especifica paquets múltiples\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "no es pot obrir %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "S'està instal·lant %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "S'està esborrant els paquets reempaquetats:\n"
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\tS'està esborrant %s:\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: no és un paquet rpm\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: No hi ha signatura disponible\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "ha fallat la lectura: %s (%d)\n"
@@ -2974,599 +2955,603 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "es poden emprar scripts en lua."
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "crea un conjunt de transaccions"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "diferent"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "el paquet %s és per a arquitectures %s"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "el paquet %s és per a sistemes operatius %s"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "el paquet %s ja s'ha instal·lat"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "el camí %s del paquet %s no és reubicable"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "el fitxer %s té un conflicte amb els intents d'instal·lació de %s i %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "el fitxer %s de la instal·lació de %s té un conflicte amb un fitxer del "
 "paquet %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "ja s'ha instal·lat el paquet %s, que és més nou que %s"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "el paquet a instal·lar %s necessita %ld%cB al sistema de fitxers %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "el paquet a instal·lar %s necessita %ld nodes-i al sistema de fitxers %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "el paquet %s és requerit per %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(instalat) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s té conflictes amb %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "error desconegut %d en manipular el paquet %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "falten el segon ':' a %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "falta el nom d'arquitectura a %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Línia de dades incompleta a %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Massa arguments a la línia de dades a %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Número d'arquitectura/S.O. incorrecte: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Línia per defecte incorrecta a %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Massa arguments a la línia per defecte a %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "No es pot llegir %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "manca ':' (trobat a 0x%02x) a %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manca un argument per a %s a %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "ha fallat l'expansió de %s a %s:%d «%s»\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "no puc obrir %s a %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "falta l'arquitecutra per a %s a %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "opció incorrecte '%s' a %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Sistema desconegut: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "No es pot expandir %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "No es pot llegir %s, el valor de HOME és massa llarg.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "No es pot obrir %s per a llegir-lo: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "no es pot obrir la base de dades Packages a %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "hi ha un '(' de més a l'etiqueta del paquet: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "falta '(' a l'etiqueta del paquet: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "falta ')' a l'etiqueta del paquet: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "no puc obrir la base de dades Solve a %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "S'està afegint: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Suggerència: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    Resolucions suggerides:\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "sistemes de fitxers muntats:\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%08x %8u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\tS'està assignant espai per a %d entrades\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr "\t\tAdreça de l'entrada:  %p\n"
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr "\tEl nombre de referències és zero... s'alliberarà\n"
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr "\tS'ha trobat una entrada a l'adreça: %p\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Mida esperada: %12d = cap(%d)+sigs(%d)+farciment(%d)+dades(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Mida real: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatura: mida(%d)+farciment(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No es pot executar %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "ha fallat el pgp\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "el pgp no ha escrit la signatura\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Mida de la signatura del PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "no es pot llegir la signatura\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "S'han rebut %d bytes de la signatura PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "ha fallat l'execució del gpg (%d)\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "el gpg no ha escrit la signatura\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Mida de la signatura del GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "S'han rebut %d bytes de la signatura del GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Especificació invàlida de %%_signature al fitxer de macros\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, 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"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Heu d'establir «%%_pgp_name» al vostre fitxer de macros\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "Mida de la capçalera i la càrrega: "
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "Suma MD5: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "Suma SHA1 de la capçalera: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Capçalera "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 msgid " signature: "
 msgstr " signatura: "
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr " Signatura DSA: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verifiqueu la signatura: paràmetres dolents\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Suma MD5 incorrecta: no està disponible\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatura: desconeguda (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "s'està excloent el directori %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 "S'està obtenint la capçalera reempaquetada de l'element de la transacció\n"
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\tS'està cercant %s...\n"
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr "\tS'han trobat coincidències.\n"
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr "\tNo s'han trobat coincidències.\n"
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr "\tNo s'ha trobat el paquet reempaquetat.\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr "\tREMOVETID coincideix amb INSTALLTID.\n"
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\tNom:  %s.\n"
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\tEl paquet reempaquetat era %s...\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 "No s'ha pogut obtenir la instància de l'element d'instal·lació de la base de "
 "dades.\n"
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\tS'ha afegit la capçalera del paquet reempaquetat: %s.\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr "\tS'ha afegit de l'element d'instal·lació %s.\n"
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr "\tS'ha afegit l'element de supressió.\n"
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr "\tS'ha trobat l'element d'actualització existent.\n"
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr "\tNo s'està afegint l'element de supressió per a %s.\n"
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\tS'ha afegit el paquet reempaquetat %s.\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\tS'ha afegit des de l'element de supressió %s.\n"
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr "\tNo s'ha reempaquetat el paquet... res a fer.\n"
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr "S'ha produït un error en reempaquetar el paquet\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "s'està fent la comprovació de sanitat de %d elements\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr "s'està executant els scripts anteriors a la transacció\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "s'està calculant les disposicions dels fitxers\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr "No s'ha pogut afegir. No es pot llegir la capçalera de paquet.\n"
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "No s'ha pogut afegir a rpmpsmStage().\n"
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr "No s'ha pogut afegir. No es pot obtenir la llista de fitxers.\n"
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "No s'ha pogut suprmir a rpmpsmStage().\n"
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr "s'està executant els scripts posteriors a la transacció\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr "manca   %c %s"
@@ -3576,60 +3561,60 @@ msgstr "manca   %c %s"
 msgid "Unknown system error"
 msgstr "Sistema desconegut: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d error(%d) de %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d error(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "tancat   entorn de bd %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "suprimit   entorn de bd %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "obrint   entorn de bd %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "tancat   índex de bd %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "verificat índex de bd       %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "obrint   índex de bd       %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "no es pot obtenir el blocatge %s a %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "exclusiu"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "compartit"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "blocat   índex bd       %s/%s\n"
@@ -3655,76 +3640,76 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 "%s té un valor de tipus «enter» massa llarg o massa petit, s'ignorarà\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "manca { després de %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "manca } després de %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "el format de l'etiqueta és buit"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "el nom de l'etiqueta és buit"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "etiqueta desconeguda"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "s'esperava ] al final de la matriu"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "no s'esperava ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "no s'esperava }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "s'esperava ? a l'expressió"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "s'esperava { després de ? a l'expressió"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "s'esperava } a l'expressió"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "s'esperava : després de ? a la subexpressió"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "s'esperava { després de : a l'expressió"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "s'esperava | al final de l'expressió"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(índex fora de rang)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "iterador de matrius emprat amb matrius de mides diferents"
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3747,387 +3732,373 @@ msgstr ""
 msgid "verify database files"
 msgstr "verifica els fitxers de la base de dades"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "genera capçaleres compatibles amb l'empaquetat antic rpm2 i 3"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nom d'etiqueta no reconegut: s'ignorarà «%s»\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, 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"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "no es pot obrir l'índex %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "no s'ha establert cap dbpath\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, 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"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: s'està ignorant"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, 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"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: s'està ignorant"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: s'ha obtingut la capçalera #%u malmesa -- s'està ignorant.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, 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"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 "error(%d) en establir el registre de la capçalera #%d per a la supressió de %"
 "s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "s'està suprimint «%s» de l'índex %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "s'està suprimint %d entrades de l'índex %s.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, 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"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "error(%d) en emmagatzemar el registre «%s» en %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "error(%d) en suprimir el registre «%s» de %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "error(%d) en assignar la instància de nou paquet\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: s'està ignorant"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "s'està afegint «%s» a l'índex de %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "s'estan afegint %d entrades a l'índex %s.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "error(%d) en emmagatzemar el registre %s a %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "s'està suprimint %s després del remuntatge del db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "no s'ha establert el dbpath"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "s'està remuntant la base de dades %s a %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "ja existeix la base de dades temporal %s\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "s'està creant el directori %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "s'està creant el directori %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "s'està obrint la base de dades antiga amb dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "s'està obrint la nova base de dades amb dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, 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"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "no es pot afegir el registre originalment a %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 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"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 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"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, 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"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "s'està suprimint el directori %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "no s'ha pogut suprimir el directori %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "tancat   índex de bd %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "obrint   índex de bd       %s/%s %s mode=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== actiu %d buit %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(buit)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(buit)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr ""
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "La macro %%%s té un cos inacabat\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "La macro %%%s té un nom invàlid (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "La macro %%%s té opcions inacabades\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "La macro %%%s té un cos buit\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "No s'ha expandit la macro %%%s\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "La macro %%%s té un nom invàlid (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "La macro %%%s (%s) no s'ha emprat sota el nivell %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opció desconeguda %c a %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "La profunditat de la recursió (%d) és més gran que el màxim (%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c sense terminar: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% precedeix una macro que no es pot analitzar\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "No s'ha trobat la macro %%%.*s, s'ignorarà\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Fitxer %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "El fitxer %s fa menys de %u bytes\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "La sintaxi antiga no és disponible: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "es poden emprar scripts en lua."
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: ha fallat l'Fwrite: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "número de paquet invàlid: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: ha fallat l'Fflush: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Correcte"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Resposta incorrecta del servidor"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Error d'E/S del servidor"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "No s'ha pogut resoldre l'adreça del servidor"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "No s'ha pogut resoldre el nom de l'adreça del servidor"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "No s'ha pogut connectar al servidor"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "No s'ha pogut establir la connexió de dades del servidor"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Error d'E/S al fitxer local"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "S'ha produït un error en establir el servidor remot a mode passiu"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "No s'ha trobat el fitxer al servidor"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "S'està interrompent"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Error desconegut o inesperat"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "ha fallat la lectura: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(cap error)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "error fatal: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "error: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "avís: "
 
@@ -4136,44 +4107,76 @@ msgstr "avís: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "l'assignació de memòria (%u bytes) ha retornat NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "el port de la url ha de ser un número\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "no s'ha pogut crear %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "no verifiquis la signatura de la capçalera i la càrrega"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 "no actualitzis la base de dades de la memòria cau, només escriu els camins "
 "dels paquets"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr "Opcions del recorregut de fitxers de l'arbre:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: la macro %%{_cache_dbpath} està mal configurada.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ha fallat l'operació de la memòria cau: ec %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ha fallat la lectura del manifest: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: llegeix %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "No es pot escriure la capçalera final\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "s'ha produït un error en crear el fitxer temporal %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "aquesta versió d'RPM no implementa l'empaquetament de la versió 1\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr "aquesta versió d'RPM només permet empaquetar amb valors <=4\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: no es pot signar un empaquetat v1\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: no es pot tornar a signar un empaquetat v2\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: cap signatura disponible (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Fitxer %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "El fitxer %s fa menys de %u bytes\n"
+
 #~ msgid "package %s pre-transaction syscall(s): %s failed: %s"
 #~ msgstr ""
 #~ "crides de sistema anteriors a la transacció del paquet %s: ha fallat %s: %"
diff --git a/po/cs.po b/po/cs.po
index 68cb3a657..b9080afe4 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -10,52 +10,52 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "chybn� z�vislosti p�i sestavov�n�:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nelze otev��t spec soubor %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Nelze otev��t rouru pro tar: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Nelze ��st spec soubor z %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Nelze p�ejmenovat %s na %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "nemohu zjistit stav %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Soubor %s nen� oby�ejn� soubor.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Nezd� se, �e by %s byl spec soubor.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Sestavuji c�lov� platformy: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Sestavuji pro c�l %s\n"
@@ -75,168 +75,168 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Volby dotaz� (s -q or --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Vollby kontroly (s -V or --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "Vollby kontroly (s -V or --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Volby signatury:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Volby datab�ze:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Sestavovac� volby s [ <spec_soubor> | <tar_soubor> | <zdrojov�_bal��ek> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Volby pro Instalaci/Aktualizaci/Maz�n�:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "Spole�n� volby pro v�echny m�dy:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Tento program lze voln� ���it podle podm�nek GNU GPL."
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern� chyba p�i zpracov�n� parametr� (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavn� re�im"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "neo�ek�van� p��znak pro dotaz"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "neo�ek�van� form�t dotazu"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "neo�ek�van� zdroj dotazu"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "vynucena m��e b�t jen instalace, aktualizace, smaz�n� zdrojov�ch k�d� a spec "
 "souboru"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 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:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 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:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry pro --prefix musej� za��nat znakem /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 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:425
+#: rpmqv.c:420
 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:429
+#: rpmqv.c:424
 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:433
+#: rpmqv.c:428
 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:437
+#: rpmqv.c:432
 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:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "pou��t lze jen jeden z parametr� --excludedocs a --includedocs"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 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:449
+#: rpmqv.c:444
 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:454
+#: rpmqv.c:449
 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:458
+#: rpmqv.c:453
 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:462
+#: rpmqv.c:457
 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:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -244,7 +244,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:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -252,7 +252,7 @@ msgstr ""
 "volba pro potla�en� trigger� m��e b�t pou�ita jen p�i instalaci nebo "
 "odstra�ov�n� bal��k�"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -260,13 +260,13 @@ msgstr ""
 "--nodeps m��e b�t pou�it jen p�i sestavov�n�, rekompilaci, instalaci, "
 "odstra�ov�n� a kontrole"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test m��e b�t pou�it jen p�i instalaci, odstra�ov�n� a sestavov�n�"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -274,107 +274,107 @@ msgstr ""
 "--root (-r) m��e b�t pou�it jen p�i instalaci, odstra�ov�n�, dotazech nebo "
 "znovuvytvo�en� datab�ze"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry pro --root (-r) musej� za��nat znakem /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "��dn� soubory k podeps�n�\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "p��stup k souboru %s se nezda�il\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp nenalezeno: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Vlo�te heslovou fr�zi: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Chybn� heslov� fr�ze\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Heslov� fr�ze je v po��dku.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "�patn� %%_signature spec v souboru maker.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign m��e b�t pou�it jen p�i sestavov�n� bal��k�"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "spu�t�n� selhalo\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestaven� nezad�ny ��dn� bal��ky"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "pro sestaven� nezad�ny ��dn� spec soubory"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "pro sestaven� nezad�ny ��dn� tar soubory"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nezad�ny ��dn� bal��ky pro instalaci"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "nezad�ny ��dn� bal��ky pro instalaci"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "k dotazu nezad�ny ��dn� parametry"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezad�ny ��dn� bal��ky"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "k dotazu nezad�ny ��dn� parametry"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Nelze otev��t do�asn� soubor.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Prov�d�n�(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Spu�t�n� %s selhalo (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "�patn� n�vratov� k�d z %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -433,92 +433,92 @@ msgstr "&& a || nen� podporov�no pro �et�zce\n"
 msgid "syntax error in expression\n"
 msgstr "chyba syntaxe ve v�razu\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK selhal: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Chyb� '(' v %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Chyb� ')' v %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Neplatn� %s token: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Chyb�j�c� %s v %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "N�sleduje nepr�zdn� znak %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "�patn� syntaxe: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "�patn� pr�va spec: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "�patn� pr�va adres��e: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Neobvykl� d�lka locale: \"%.*s\" v %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Duplicitn� locale %.*s v %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Dosa�en limit pro %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Jen jeden parametr pro %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dva soubory na jednom ��dku: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Soubor mus� za��nat na \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nelze m�chat speci�ln� %%doc s ostatn�m� formami: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Soubor uveden dvakr�t: %s\n"
@@ -548,7 +548,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead selhalo\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -568,7 +568,7 @@ msgstr "Soubor pot�ebuje �vodn� \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob nen� dovolen: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Soubor nenalezen globem: %s\n"
@@ -578,7 +578,7 @@ msgstr "Soubor nenalezen globem: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nemohu otev��t %%files soubor %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "��dek: %s\n"
@@ -588,7 +588,7 @@ msgstr "��dek: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "�patn� soubor: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�patn� vlastn�k/skupina: %s\n"
@@ -610,185 +610,175 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Zpracov�v�m soubory: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: p��li� mnoho UID\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: p��li� mnoho UID\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: p��li� mnoho UID\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: p��li� mnoho GID\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: p��li� mnoho GID\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: p��li� mnoho GID\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nemohu z�skat jm�no po��ta�e: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "vytv��en� arch�vu selhalo na souboru %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "vytv��en� arch�vu selhalo: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "z�pis cpio_copy selhal: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "�ten� cpio_copy selhalo: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nemohu otev��t PreIn soubor: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nemohu otev��t PreUn soubor: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nemohu otev��t PostIn soubor: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nemohu otev��t PostUn soubor: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nemohu otev��t VerifyScript soubor: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nemohu otev��t soubor se spu�t� (trigger): %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otev�en� %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: �ten� %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek selhal: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nen� RPM bal��ek\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: �ten� hlavi�ky z %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nemohu zapsat hlavi�ku do %s: %s\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "�patn� CSA data\n"
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "Nemohu zapsat hlavi�ku do %s: %s\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generuji podpis: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otev��t %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat bal��ek: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nemohu otev��t c�l pro podeps�n� %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nemohu zapsat hlavi�ku do %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nemohu p�e��st payload z %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zaps�no: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nemohu vygenerovat jm�no souboru pro bal��ek %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
@@ -798,32 +788,32 @@ msgstr "nemohu vytvo�it %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "��dek: %d: druh� %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "Polo�ky v %%changelog mus� za��nat znakem *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "nekompletn� polo�ka v %%changelog\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "�patn� datum v %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, fuzzy, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog nen� se�azen sestupn� podle �asu\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "chyb�j�c� jm�no v %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "��dn� popis v %%changelog\n"
@@ -833,17 +823,17 @@ msgstr "��dn� popis v %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "��dek %d: Chyba p�i parsov�n� %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "��dek %d: �patn� volba %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "��dek %d: P��li� mnoho jmen: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "��dek %d: Bal��ek neexistuje: %s\n"
@@ -853,210 +843,210 @@ msgstr "��dek %d: Bal��ek neexistuje: %s\n"
 msgid "line %d: Second description\n"
 msgstr "��dek %d: Druh� description\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "��dek %d: Chyba p�i parsov�n� %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "��dek %d: Druh� seznam %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architektura je vy�azena: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architektura nen� zahrnuta: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS je vy�azen: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS nen� zahrnut: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "Polo�ka %s mus� b�t v bal��ku p��tomna: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Duplikovan� polo�ka %s v bal��ku: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Nemohu otev��t ikonu %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Nemohu p�e��st ikonu %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Nezn�m� typ ikony: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "��dek %d: Po�kozen� zna�ka: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "��dek %d: Pr�zdn� zna�ka: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "��dek %d: Nep��pustn� znak '-' v %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot nem��e b�t \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "��dek %d: Docdir mus� za��nat na '/': %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "��dek %d: Polo�ka Epoch/Serial mus� b�t ��slo: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "��dek %d: �patn� ur�en� %s: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "��dek %d: �patn� form�t BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern� chyba: �patn� zna�ka: %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "�patn� specifikace bal��ku: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Bal��ek ji� existuje: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "��dek %d: Nezn�m� zna�ka: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec soubor nem��e pou��t BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "�patn� zdrojov� soubor: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Patch ��slo %d neexistuje\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Zdroj ��slo %d neexistuje\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Nemohu na��st nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Chyba p�i parsov�n� %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "��dek %d: �patn� parametr v %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "��dek %d: �patn� volba v %%setup %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "��dek %d: K %%patch -b pot�ebuji parametr: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "��dek %d: K %%patch -z pot�ebuji parametr: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "��dek %d: �patn� parametr pro %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "��dek %d: K %%patch -p pot�ebuji parametr: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "��dek %d: �patn� parametr pro %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "P��li� mnoho patch�!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "��dek %d: �patn� parametr pro %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "��dek %d: druh� %%prep\n"
@@ -1109,297 +1099,302 @@ msgstr "��dek %d: Druh� %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "��dek %d: Chyba p�i parsov�n� %%description: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "��dek %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nemohu otev��t %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Neuzav�en� %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean vr�til %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "po�kozen� p��kaz %%include\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Nenalezeny ��dn� kompatibiln� architektury pro sestaven�\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Bal��ek nem� ��dn� %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot byl ji� nastaven, ignoruji %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "sestaven� podle %prep (rozbalen� zdrojov�ch k�d� a aplikace patch�) podle "
 "<spec_soubor>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<spec_soubor>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "sestaven� podle %build (%prep, pak kompilace) podle <spec_soubor>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "sestaven� podle %install (%prep, %build, pak install) podle <spec_soubor>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "kontrola ��sti %files ve <spec_soubor>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "vytvo�en� zdrojov�ho a bin�rn�ho bal��ku podle <spec_soubor>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "vytvo�en� pouze bin�rn�ho bal��ku podle <spec_soubor>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "vytvo�en� zdrojov�ho bal��ku podle <spec_soubor>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "sestaven� podle %prep (rozbalen� zdrojov�ch k�d�, aplikace patch�) z "
 "<tar_soubor>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tar_soubor>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "sestaven� podle %build (%prep, pak kompilace) z <tar_soubor>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "sestaven� podle %%install (%prep, %build, pak install) z <tar_soubor>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "kontrola ��sti %files z <tar_soubor>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "vytvo�en� zdrojov�ho a bin�rn�ho bal��ku z <tar_soubor>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "vytvo�en� pouze bin�rn�ho bal��ku z <tar_soubor>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "vytvo�en� pouze zdrojov�ho bal��ku z <tar_soubor>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "vytvo�en� bin�rn�ho bal��ku ze <zdrojov� bal��ek>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<zdrojov� bal��ek>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr "sestaven� podle %%install (v�etn� %prep, %build) ze <zdrojov� bal��ek>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "build root p�edefinov�n"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "po dokon�en� odstranit sestavovac� strom"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "generovat hlavi�ky kompatibiln� s RPM verze 4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignorovat ExcludeArch: direktivy ve spec souboru"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "ladit n�stroj stavu soubor�"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "nespou�t�t ��dn� etapy vytv��en� bal��ku"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "nekontrolovat z�vislosti bal��k�"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "generovat hlavi�ky bal��k� kompatibiln� s RPM verze 2 a 3"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "nekontrolovat z�vislosti bal��k�"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "nekontrolovat architekturu bal��ku"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "ov��it podpis v bal��ku"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "neakceptovat i18N popisky ze spec souboru"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "po dokon�en� odstranit zdrojov� k�dy"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "po dokon�en� odstranit spec soubor"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "p�esko�it p��mo na ur�enou etapu (pouze pro c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "generovat PGP/GPG podpis"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "c�lov� platforma p�edefinov�na"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "vyhledat i18N �et�zce ve specfile katalogu"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+#, fuzzy
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "generovat hlavi�ky bal��k� kompatibiln� s RPM verze 2 a 3"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nemohu prov�st fork %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s selhalo\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "Nemohu zapsat v�echna data do %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "otev�en� %s selhalo: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir %s selhal: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s rmdir %s selhal: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Hled�m   %s: (pou�it %s)...\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Selhalo vyhled�n� %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "��dek %d: �patn� ��slo: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "��dek %d: �patn� ��slo %s: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "��dek %d: �patn� ��slo %s: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "nemohu prov�st dotaz %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
@@ -1445,55 +1440,55 @@ msgstr ""
 msgid " failed - "
 msgstr "selhal - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "bal��ek %s je ji� nainstalov�n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "bal��ek %s je ji� nainstalov�n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "�patn� soubor: %s: %s\n"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstra�uji %s-%s-%s \"%s\" z tsort relac�.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== ukl�d�n� tsort relac�\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1501,26 +1496,26 @@ msgid ""
 msgstr ""
 "========== tsorting bal��k� (po�ad�, #p�edch�dce, #n�sledovn�k, hloubka)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== pouze �sp�n� (po�ad� dle prezentace)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "SMY�KA:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokra�uje tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(nen� ��slo)"
 
@@ -1533,16 +1528,16 @@ msgstr "(nen� ��slo)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(nen� ��slo)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "vynechat p��padn� PGP podpisy"
@@ -1562,7 +1557,7 @@ msgstr "mntctl() nevr�til p��pojn� body: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nemohu otev��t %s: %s\n"
@@ -1577,12 +1572,12 @@ msgstr "Soubor %4d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "soubor %s je na nezn�m�m za��zen�\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========= Adres��e, kter� nebyly explicitn� za�azeny do bal��ku:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
@@ -1637,47 +1632,42 @@ msgstr "%s unlink %s selhal: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s vytvo�en jako %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr ""
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1732,189 +1722,180 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "pr�ce s bal��ky verze 1 nen� podporov�na touto verz� RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "tato verze RPM podporuje pr�ci s bal��ky s verz� <= 4\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "neinstalov�n  "
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "vypsat expanzi makra <v�raz>+"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "��st <soubor:...> m�sto implicitn�ho makro souboru"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "zak�zat pou�it� libio(3) API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "odeslat stdout do <p��kazu>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "pou��t <adr> jako adres�� nejvy��� �rovn�"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "zobrazit zn�m� zna�ky pro dotazy"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "zobrazit fin�ln� konfiguraci rpmrc a maker"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "poskytnout v�stu s m�n� detaily"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "poskytnout detailn�j�� v�stup"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "vypsat pou��vanou verzi rpm"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "ladit n�stroj stavu soubor�"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "ladit n�stroj stavu soubor�"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Intern� chyba p�i zpracov�n� parametr� (%d) :-(\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "ladit n�stroj stavu soubor�"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "ladit n�stroj stavu soubor�"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "ladit rpmio I/O"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "ladit manipulaci s URL cache"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2355,7 +2336,7 @@ msgstr "nekontrolovat soubory v bal��ku"
 msgid "don't verify files in package"
 msgstr "nekontrolovat soubory v bal��ku"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "nekontrolovat z�vislosti bal��k�"
 
@@ -2402,99 +2383,99 @@ msgstr "podepsat bal��ek (zahodit aktu�ln� podpis)"
 msgid "generate signature"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "o�ek�v�m bal��ek se zdrojov�mi k�dy, nalezen v�ak bin�rn�\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "zdrojov� bal��ek neobsahuje .spec soubor\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: spou�t�m %s skript(y) (pokud existuj�)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: scriptlet %s selhal (%d), p�eskakuji %s-%s-%s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "proveden� %s skripletu z %s-%s-%s selhalo, n�vratov� k�d: %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "proveden� %s skripletu z %s-%s-%s selhalo, n�vratov� k�d: %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s obsahuje %d soubor�, test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: scriptlet %s selhal (%d), p�eskakuji %s-%s-%s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalov�n� arch�vu selhalo %s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otev��t %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "nespr�vn� form�t: %s\n"
@@ -2596,129 +2577,110 @@ msgstr "z�znam bal��ku ��slo: %u\n"
 msgid "record %u could not be read\n"
 msgstr "z�znam %u nelze p�e��st\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "bal��ek %s nen� nainstalov�n\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "�patn� soubor: %s: %s\n"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (p�id�no poskytuje)\n"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otev�en� selhalo: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile selhalo\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek selhal: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "parametr nen� RPM bal��ek\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 #, fuzzy
 msgid "NOT OK"
 msgstr "NE "
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NE "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "ANO"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2727,73 +2689,69 @@ msgstr ""
 "Z�vislost \"B\" pot�ebuje obdob� (p�edpokl�d�no stejn� jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "bal��ek %s-%s-%s m� nespln�n� po�adavky: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 #, fuzzy
 msgid "========== relocations\n"
 msgstr "========== ukl�d�n� tsort relac�\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vy�azen: %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s vytvo�en jako %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Prov�d�n�(%s): %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "Prov�d�n�(%s): %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "nemohu prov�st dotaz %s: %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otev�en� %s selhalo: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "nezn�m� zna�ka"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "chybn� z�vislosti p�i sestavov�n�:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr ""
@@ -2820,106 +2778,121 @@ msgstr ""
 msgid "Upgrading packages..."
 msgstr "aktualizace bal��ku"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Hled�m   %s: (pou�it %s)...\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, fuzzy, c-format
 msgid "Retrieving %s\n"
 msgstr "RPM verze %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, fuzzy, c-format
 msgid " ... as %s\n"
 msgstr "%s ulo�eno jako %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "neinstalov�n  "
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<zdrojov� bal��ek>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "cesta %s v bal��ku %s nen� p�em�stiteln�"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "nainstalovat bal��ek"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "��dn� bal��ek neaktivuje %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "vytvo�en� zdrojov�ho a bin�rn�ho bal��ku z <tar_soubor>"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "nainstalovat bal��ek"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, fuzzy, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "Polo�ka %s mus� b�t v bal��ku p��tomna: %s\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, fuzzy, c-format
 msgid "Installing %s\n"
 msgstr "��dek: %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "RPM verze %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "parametr nen� RPM bal��ek\n"
+
+#: lib/rpmlead.c:103
+#, c-format
+msgid "%s: illegal signature type\n"
+msgstr ""
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2965,605 +2938,609 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- nen� podporov�no pro �et�zce\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "bal��ek %s je pro jinou architekturu"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "bal��ek %s je pro jin� opera�n� syst�m"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "bal��ek %s je ji� nainstalov�n"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "cesta %s v bal��ku %s nen� p�em�stiteln�"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "soubor %s zp�sobuje konflikt mezi instalovan�m %s a %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "soubor %s z instalace %s koliduje se souborem z bal��ku %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "bal��ek %s (kter� je nov�j��, ne� %s) je ji� nainstalov�n"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "instalace bal��ku %s pot�ebuje %ld%cB na syst�mu soubor� %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalace bal��ku %s pot�ebuje %ld inod� na syst�mu soubor� %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " je nutn� pro %s-%s-%s\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "neinstalov�n  "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "nezn�m� chyba %d vznikla p�i manipulaci s bal��kem %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "Chyb� '(' v %s %s\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "�patn� pr�va adres��e: %s(%s)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "Sestavuji c�lov� platformy: %s\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "nemohu otev��t %s: %s\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "��dek %d: �patn� form�t BuildArchitecture: %s\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "nemohu zjistit stav %s: %m\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, fuzzy, c-format
 msgid "Unknown system: %s\n"
 msgstr "Nezn�m� typ ikony: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "nemohu znovu otev��t payload: %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nemohu otev��t %s: %s\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otev��t RPM datab�zi v %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "neplatn� ��slo bal��ku: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Chyb� '(' v %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "neplatn� ��slo bal��ku: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "nemohu otev��t RPM datab�zi v %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "��dek: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "RPM verze %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "z�sk�v�m seznam p�ipojen�ch syst�m� soubor�\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "Soubor %4d: %07o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "Prov�d�n�(%s): %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "%s selhalo\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "spu�t�n� selhalo\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "�patn� %%_signature spec v souboru maker.\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Velikost hlavi�ky je p�ili� velk�"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "nekontrolovat SHA1 digest v hlavi�ce"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "o�ek�v�m bal��ek se zdrojov�mi k�dy, nalezen v�ak bin�rn�\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "��dn� bal��ek neaktivuje %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<zdrojov� bal��ek>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<zdrojov� bal��ek>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "chyba p�i p�i �ten� hlavi�ky bal��ku\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "chyb� { po %"
@@ -3573,61 +3550,61 @@ msgstr "chyb� { po %"
 msgid "Unknown system error"
 msgstr "Nezn�m� typ ikony: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 #, fuzzy
 msgid "shared"
 msgstr "sd�len v s�ti "
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
@@ -3652,76 +3629,76 @@ msgstr ""
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "chyb� { po %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "po %{ chyb� }"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "pr�zdn� form�t zna�ky"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "pr�zdn� jm�no zna�ky"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "nezn�m� zna�ka"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "na konci pole o�ek�v�no ]"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "neo�ek�van� ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "neo�ek�van� }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "ve v�razu o�ek�v�n ?"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "ve v�razu je po ? o�ek�v�na {"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "ve v�razu je o�ek�v�na }"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "v podv�razu je po ? o�ek�v�na :"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "ve v�razu je po : o�ek�v�na {"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "na konci v�razu je o�ek�v�no |"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3742,390 +3719,375 @@ msgstr ""
 msgid "verify database files"
 msgstr "zkontrolovat datab�zov� soubory"
 
-#: rpmdb/poptDB.c:25
-#, fuzzy
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "generovat hlavi�ky bal��k� kompatibiln� s RPM verze 2 a 3"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nemohu otev��t RPM datab�zi v %s\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "nemohu otev��t RPM datab�zi v %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstra�uji %s-%s-%s \"%s\" z tsort relac�.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstra�uji %s-%s-%s \"%s\" z tsort relac�.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu vytvo�it datab�zi z existuj�c� datab�ze"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "nemohu prov�st dotaz %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Nelze p�ejmenovat %s na %s: %m\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, c-format
 msgid "closed   sql db         %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr ""
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr ""
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nezn�m� typ ikony: %s\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Glob nen� dovolen: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, fuzzy, c-format
-msgid "File %s: %s\n"
-msgstr "soubor %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr ""
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- nen� podporov�no pro �et�zce\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- nen� podporov�no pro �et�zce\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "neplatn� ��slo bal��ku: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek selhal: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Nemohu otev��t c�l pro podeps�n� %s: %s\n"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 #, fuzzy
 msgid "File not found on server"
 msgstr "Soubor nenalezen: %s\n"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "neo�ek�van� zdroj dotazu"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 #, fuzzy
 msgid "(no error)"
 msgstr "(chyba: 0x%x)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 #, fuzzy
 msgid "fatal error: "
 msgstr "Intern� chyba"
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 #, fuzzy
 msgid "error: "
 msgstr "(chyba: 0x%x)"
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr ""
 
@@ -4134,45 +4096,67 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "��dek %d: Polo�ka Epoch/Serial mus� b�t ��slo: %s\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "ov��it podpis v bal��ku"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Volby signatury:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: otev�en� selhalo: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: �ten� %s: %s\n"
+
+#, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Nemohu zapsat hlavi�ku do %s: %s\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "chyba p�i vytv��en� do�asn�ho souboru %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "pr�ce s bal��ky verze 1 nen� podporov�na touto verz� RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr "tato verze RPM podporuje pr�ci s bal��ky s verz� <= 4\n"
+
+#, fuzzy
+#~ msgid "File %s: %s\n"
+#~ msgstr "soubor %s: %s\n"
+
 #, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "chybn� z�vislosti p�i sestavov�n�:\n"
diff --git a/po/da.po b/po/da.po
index a232dc73b..006de3348 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -11,52 +11,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9alpha\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "afh�ngighedskrav for pakkeopbygning kunne ikke im�dekommes:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan ikke �bne spec-fil %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Kunne ikke �bne tar-videref�rsel: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Kunne ikke l�se spec-fil fra %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Kunne ikke omd�be %s til %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "kunne ikke finde %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Filen %s er ikke en regul�r fil.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Filen %s synes ikke at v�re en spec-fil.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Opbygger m�l-platforme: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Opbygger for m�l %s\n"
@@ -76,178 +76,178 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Foresp�rgselstilvalg (med -q eller --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifikationstilvalg (med -V eller --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "Verifikationstilvalg (med -V eller --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Signaturtilvalg"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Databasetilvalg:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opbygningstilvalg med [ <spec-fil> | <tararkiv> | <kildepakke> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "F�lles tilvalg for alle rpm-tilstande:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "kun �t hovedtilvalg kan angives"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "uventet foresp�rgselsflag"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "uventet foresp�rgselsformat"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "uventet foresp�rgselskilde"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omrokeres under installation"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun bruges, n�r nye pakker installeres"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametre til --prefix skal starte med et /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun angives ved installation"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun angives ved installation"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan kun angives ved installation"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan kun angives ved installation"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan kun angives ved installation"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "kun �n af --excludedocs og --includedocs kan angives"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan kun angives ved installation"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan kun angives ved installation"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan kun angives ved installation"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan kun angives ved installation"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan kun angives ved installation"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 #, 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:477
+#: rpmqv.c:472
 #, 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:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -255,13 +255,13 @@ msgstr ""
 "--nodeps kan kun angives ved opbygning, genopbygning, genovers�ttelse, "
 "installation, sletning og verifikation"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan kun angives ved installation, sletning og opbygning"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -269,107 +269,107 @@ msgstr ""
 "--root (-r) kan kun angives ved installation, sletning, foresp�rgsel og "
 "genopbygning af databasen"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parameteren til --root (-r) skal starte med et /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "ingen filer at underskrive\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke tilg� filen %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp ikke fundet: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Indtast adgangskode: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Adgangskode ikke godkendt\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Adgangskode godkendt.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign kan kun bruges ved pakkeopbygning"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "eksekvering mislykkedes\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler angivet til genopbygning"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "ingen spec-fil angivet til opbygning"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "ingen tar-arkiver angivet til opbygning"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "ingen parametre angivet ved foresp�rgsel"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "ingen parametre angivet ved verifikation"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved foresp�rgsel"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke �bne midlertidig fil.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Udf�rer(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Udf�relse af %s mislykkedes (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Fejl-afslutningsstatus fra %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -428,92 +428,92 @@ msgstr "&& og || underst�ttes ikke for strenge\n"
 msgid "syntax error in expression\n"
 msgstr "syntaksfejl i udtryk\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK-fejl: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Manglende '(' i %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Manglende ')' i %s %s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ugyldigt %s-symbol: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Manglende '(' i %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Ikke-mellemrum efterf�lger %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Ugyldig syntaks: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Ugyldig tilstandsangivelse: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Ugyldig dirmode-spec: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Anormal locale-l�ngde: \"%.*s\" i %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Dobbelt locale %.*s i %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Tr�fningsgr�nse for %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Kun et parameter for %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "To filer p� �n linie: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Fil skal begynde med \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande special-%%doc med andre former: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil angivet to gange: %s\n"
@@ -543,7 +543,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -563,7 +563,7 @@ msgstr "Fil kr�ver foranstillet \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "linie %d: Filnavn ikke tilladt: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fil ikke fundet med glob: %s\n"
@@ -573,7 +573,7 @@ msgstr "Fil ikke fundet med glob: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke �bne '%%files'-fil %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "linie: %s\n"
@@ -583,7 +583,7 @@ msgstr "linie: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig ejer/gruppe: %s\n"
@@ -605,187 +605,177 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Genneml�ber filer: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: for mange uid'er\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: for mange uid'er\n"
 
-#: build/names.c:91
+#: build/names.c:92
 #, fuzzy
 msgid "getUidS: too many uid's\n"
 msgstr "getUnameS: for mange uid'er\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: for mange gid'er\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: for mange gid'er\n"
 
-#: build/names.c:163
+#: build/names.c:164
 #, fuzzy
 msgid "getGidS: too many gid's\n"
 msgstr "getGnameS: for mange gid'er\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Kunne ikke kanonisere v�rtsnavn: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy-skrivning mislykkedes: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy-l�sning mislykkedes: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke �bne 'PreIn'-fil: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke �bne 'PreUn'-fil: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke �bne 'PostIn'-fil: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke �bne 'PostUn'-fil: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke �bne 'VerifyScript'-fil: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunne ikke �bne skriptfilen Trigger: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: �bn %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: l�s %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke nogen RPM-pakke\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: l�ser hoved fra %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke l�se hoved fra %s: %s\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "Kunne ikke skrive hoved til %s: %s\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke l�se hoved fra %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke �bne %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke �bne sigtarget %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke l�se hoved fra %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke l�se pakkeindhold fra %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -795,32 +785,32 @@ msgstr "kan ikke oprette %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "linie %d: anden %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "'%%changelog'-indgange skal starte med *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "uf�rdig '%%changelog'-indgang\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "ugyldig dato i %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, fuzzy, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog ikke i omvendt kronologisk r�kkef�lge\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "navn mangler i %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "ingen beskrivelse i %%changelog\n"
@@ -830,17 +820,17 @@ msgstr "ingen beskrivelse i %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linie %d: Fejl ved tolkning af %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linie %d: Ugyldigt tilvalg %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "line %d: For mange navne: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "line %d: Pakken eksisterer ikke: %s\n"
@@ -850,210 +840,210 @@ msgstr "line %d: Pakken eksisterer ikke: %s\n"
 msgid "line %d: Second description\n"
 msgstr "linie %d: Anden beskrivelse\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "linie %d: Fejl ved tolkning af %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "linie %d: Anden '%%files'-liste\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arkitekturen er ekskluderet: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arkitekturen er ikke inkluderet: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS er ekskluderet: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS is ikke inkluderet: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "'%s'-felt skal v�re tilstede i pakke : %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Flere '%s'-indgange i pakke: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Kunne ikke �bne ikon %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Kunne ikke l�se ikon %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Ukendt ikontype: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "linie %d: Ugyldigt tilvalg %s: %s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linie %d: Forkert udformet m�rke: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linie %d: Tomt m�rke: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linie %d: Ugyldigt tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot kan ikke v�re \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linie %d: Docdir skal starte med '/': %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linie %d: Epoch/Serial-felter skal v�re et nummer: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linie %d: Ugyldig %s: angivere: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linie %d: Ugyldigt 'BuildArchitecture'-format: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern fejl: Falsk m�rke %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ugyldig pakkeangivelse: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakken eksisterer allerede: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linie %d: Ukendt m�rke: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec-fil kan ikke bruge BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Ugyldig kilde: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Ingen lap nummer %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Ingen kilde nummer %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Kunne ikke hente nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Fejl ved tolking af %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linie %d: Ugyldigt parameter til %%setup %c: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linie %d: Ugyldigt '%%setup'-tilvalg %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "linie %d: Kr�ver parameter til %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "linie %d: Kr�ver parameter til %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "linie %d: Ugyldigt parameter til %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "linie %d: Kr�ver parameter til %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "linie %d: Ugyldigt parameter til %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "For mange lapper (patches)!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "linie %d: Ugyldigt parameter til %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linie %d: anden %%prep\n"
@@ -1106,300 +1096,305 @@ msgstr "linie %d: Anden %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "linie %d: Fejl ved tolkning af %%description: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linie %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 "Kunne ikke �bne %s: %s\n"
 "\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Ikke-lukket %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerer %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "forkert udf�rt '%%include'-kommando\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen arkitekturer, der kan opbygges\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakke har ingen %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
 "buildroot allerede angivet, ignorerer %s\n"
 "\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "opbyg gennem %prep (udpak kilder og p�f�r lapper) ud fra <spec-fil>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<spec-fil>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "opbyg gennem %build (%prep, s� overs�t) ud fra <spec-fil>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "opbyg gennem %install (%prep, %build, s� install�r) ud fra <spec-fil>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "verific�r afsnittet %files ud fra <spec-fil>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "opbyg kilde- og bin�rpakke ud fra <spec-fil>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "opbyg kun bin�rpakke ud fra <spec-fil>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "opbyg kun kildepakke ud fra <spec-fil>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "opbyg gennem %prep (udpak kilder og p�f�r lapper) ud fra <tararkiv>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tararkiv>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "opbyg gennem %build (%prep, s� overs�t) ud fra <tararkiv>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "opbyg gennem %install (%prep, %build, s� install�r) ud fra <tararkiv>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verific�r afsnittet %files fra <tararkiv>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "opbyg kilde- og bin�rpakker ud fra <tararkiv>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "opbyg kun bin�rpakke ud fra <tararkiv>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "opbyg kun kildepakke ud fra <tararkiv>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "opbyg bin�rpakke ud fra <kildepakke>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<kildepakke>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "opbyg gennem %install (%prep, %build, s� install�r) ud fra <kildepakke>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "gennemtving opbygningsrod"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "fjern bygge-tr� ved afslutning"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "gener�r hoveder, der er kompatible med rpm4-indpakningsversionen"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignor�r 'ExcludeArch':-angivelser fra spec-fil"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr ""
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "udf�r ingen stadier af opbygningen"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 #, fuzzy
 msgid "do not verify build dependencies"
 msgstr "undlad at tjekke pakkers afh�ngighedskrav"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "gener�r pakkehoved(er), der er kompatible med (gamle) rpm[23]-indpakninger"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "undlad at tjekke pakkers afh�ngighedskrav"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "tjek ikke pakkens arkitektur"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verific�r pakkesignatur"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "accept�r ikke i18N msgstr'er fra spec-fil"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "fjern kilder ved afslutning"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "fjern spec-fil ved afslutning"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "spring direkte til angivet stadium (kun for c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "gener�r PGP/GPG-signatur"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "gennemtving m�lplatform"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "sl� i18N-strenge op i spec-fil katalog"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+"gener�r hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke udf�re %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislykkedes\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "kunne ikke skrive alle data til %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "�bning af %s mislykkedes %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "fjernelse af %s mislykkedes: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "fjernelse af %s mislykkedes: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Finder %s: (benytter %s)...\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Kunne ikke finde %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linie %d: Ugyldigt tal: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linie %d: Ugyldigt 'no%s'-tal: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linie %d: Ugyldigt %s-tal: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kunne ikke foresp�rge %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "foresp�rgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
@@ -1446,80 +1441,80 @@ msgstr ""
 msgid " failed - "
 msgstr " mislykkedes - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s JA (rpmlib tilf�rer)\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s JA (db tilf�rer)\n"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== kun efterf�lgere (pr�sentationsr�kkef�lge)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "L�KKE:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== forts�tter tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(ikke et tal)"
 
@@ -1532,16 +1527,16 @@ msgstr "(ikke et tal)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(ikke et tal)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "overspring eventuelle PGP-signaturer"
@@ -1561,7 +1556,7 @@ msgstr "mntctl() returnerede ingen monteringspunkter: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "kunne ikke finde %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunne ikke �bne %s: %s\n"
@@ -1576,11 +1571,11 @@ msgstr "Fil %4d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "fil %s er p� en ukendt enhed\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "linie %d: %s\n"
@@ -1635,47 +1630,42 @@ msgstr "�bning af %s mislykkedes %s\n"
 msgid "%s created as %s\n"
 msgstr "%s oprettet som %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "tilf�jer %d indgange til '%s'-indekset.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "fejl ved oprettelse af midlertidig fil %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1730,188 +1720,178 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "indpakningsversion 1 underst�ttes ikke af denne udgave af RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"kun indpakninger med hovedversion <= 4 underst�ttes af denne udgave af RPM\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature mislykkedes\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen tilg�ngelig signatur\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s kunne ikke installeres\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr ""
 "opretter kataloget %s\n"
 "\n"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "udl�s makroudvidelse af <udtryk>+"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "l�s <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "undlad at benytte libio(3)-API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "send standard-ud til <kmd>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "brug <katalog> som topniveau-katalog"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "vis kendte foresp�rgselsm�rker"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "vis den endelige rpmrc og makrokonfiguration"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "medtag mindre detaljerede oplysninger"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "medtag mere detaljerede oplysninger"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "vis versionen af rpm som benyttes"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "aflus rpmio I/O"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "aflus URL-bufferh�ndtering"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2365,7 +2345,7 @@ msgstr "verific�r ikke filerne i pakke"
 msgid "don't verify files in package"
 msgstr "verific�r ikke filerne i pakke"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "undlad at tjekke pakkers afh�ngighedskrav"
@@ -2414,101 +2394,101 @@ msgstr "underskriv en pakke (slet nuv�rende signatur)"
 msgid "generate signature"
 msgstr "gener�r PGP/GPG-signatur"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, bin�r fundet\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "k�rer postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "overspringer installation af %s-%s-%s, %%pre-sm�skript fejlede rc %d\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr ""
 "k�rsel af sm�skriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 "k�rsel af sm�skriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Kunne ikke l�se hoved fra %s: %s\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke �bne %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ugyldigt format: %s\n"
@@ -2610,129 +2590,110 @@ msgstr "pakkens post-nummer: %u\n"
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke l�ses\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (tilf�jede 'provide')\n"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: �bning mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile mislykkedes\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "parameter er ikke en RPM-pakke\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ingen tilg�ngelig signatur (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "IKKE O.K."
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (MANGLENDE N�GLER:    "
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (IKKE-BETROEDE N�GLER:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "O.K."
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2741,72 +2702,68 @@ msgstr ""
 "\"B\"-afh�ngighed kr�ver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== gemmer omrokeringer\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ekskluderer %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omrokerer %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ekskluderer %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "omrokerer %s til %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "omrokerer kataloget %s til %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "�bning af %s mislykkedes %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "ukendt m�rke"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "afh�ngighedskrav, der ikke kunne im�dekommes:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Forbereder..."
@@ -2834,105 +2791,120 @@ msgstr "Forbereder..."
 msgid "Upgrading packages..."
 msgstr "opgrad�r pakke"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Finder %s: (benytter %s)...\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Modtager %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "overspringer %s - overf�rsel mislykkedes - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kunne ikke installeres\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<kildepakke>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "pakke %s kan ikke omrokeres\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installerer bin�rpakker\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fejl ved l�sning fra filen %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "filen %s kr�ver en nyere version af RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "ingen pakker udl�ser %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fandt %d kilde- og %d bin�rpakker\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "installerer bin�rpakker\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kunne ikke �bne fil %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" angiver flere pakker\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kunne ikke �bne %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Modtager %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "parameter er ikke en RPM-pakke\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Ingen tilg�ngelig signatur\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "l�sning mislykkedes: %s (%d)\n"
@@ -2978,608 +2950,612 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- underst�ttes ikke for strenge\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "kan ikke opn� %s l�s p� %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "kan ikke opn� %s l�s p� %s/%s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "pakken %s h�rer til en anden arkitektur"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "pakken %s h�rer til et andet operativsystem"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "sti %s i pakke %s kan ikke omrokeres"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "filen %s skaber konflikt mellem den fors�gte installation af %s og %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "filen %s fra installationen af %s skaber konflikt med fil fra pakken %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "pakke %s (som er nyere end %s) er allerede installeret"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "installation af pakke %s kr�ver %ld%cb p� %s-filsystemet"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "installation af pakken %s kr�ver %ld inode'r p� %s-filsystemet"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " kr�ves af %s-%s-%s\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "ej installeret"
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " skaber konflikt med %s-%s-%s\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ukendt fejl %d under arbejdet med pakken %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "manglende andet ':' ved %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manglende navn p� arkitektur ved %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Uf�rdig datalinie ved %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "For mange parametre p� datalinie ved %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Ugyldigt arch/os-tal: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ufuldst�ndig standardlinie ved %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "For mange parametre i standardlinie ved %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Kunne ikke l�se %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "manglende  ':' (fandt 0x%02x) ved %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manglende parameter til %s ved %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s-udvidelse mislykkedes ved %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan ikke �bne %s ved %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manglende arkitektur for %s ved %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ugyldig tilvalg '%s' ved %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 "Ukendt system: %s\n"
 "\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan ikke udfolde %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Kunne ikke l�se %s, HOME er for stor.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke �bne %s for l�sning: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kunne ikke �bne Packages-database i %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Manglende '(' i %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "kan ikke �bne rpm-database i %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "linie: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 "kilder i: %s\n"
 "\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "henter liste over monterede filsystemer\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "Fil %4d: %07o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "omrokerer %s til %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Forventet st�rrelse: %12d = indled(%d)+sign(%d)+fyld(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk st�rrelse: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signaturst�rrelse: %d\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke udf�re %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp fejlede\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp kunne ikke skrive signatur\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP-signaturst�rrelse: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "kunne ikke l�se signaturen\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fik %d byte af PGP-signatur\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "eksekvering mislykkedes\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunne ikke skrive signaturen\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturst�rrelse: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fik %d byte GPG-signatur\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Hovedst�rrelse er for stor"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "verific�r ikke filerne i pakke"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "kildepakke forventet, bin�r fundet\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "ingen pakker udl�ser %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<kildepakke>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<kildepakke>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "fejl ved l�sning af hovedet p� pakke\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 #, fuzzy
 msgid "running pre-transaction scripts\n"
 msgstr "k�rer pr�installations-skript (hvis det findes)\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 #, fuzzy
 msgid "running post-transaction scripts\n"
 msgstr "k�rer skriptet postuninstall (hvis det findes)\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "manglende  %s"
@@ -3591,60 +3567,60 @@ msgstr ""
 "Ukendt system: %s\n"
 "\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d fejl(%d) fra %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d fejl(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, fuzzy, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "lukkede db-milj�  %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, fuzzy, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "fjernede db-milj�  %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, fuzzy, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "�bner   db-milj�  %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "lukkede db-indeks %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "lukkede db-indeks %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "�bner   db-indeks %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan ikke opn� %s l�s p� %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "eksklusiv"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "delt"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "l�ste   db-index  %s/%s\n"
@@ -3669,76 +3645,76 @@ msgstr "%s har for stor eller lille 'long'-v�rdi, overspringes\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s har for stor eller lille heltalsv�rdi, overspringes\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "manglende { efter %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "manglende } efter %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "tomt m�rkeformat"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "tomt m�rkenavn"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "ukendt m�rke"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] forventet ved slutningen af tabel"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "uventet ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "uventet }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? forventet i udtryk"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ forventet efter ? i udtryk"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} forventet i udtryk"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ": forventet efter ?-underudtryk"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ forventet efter : i udtryk"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| forventet ved slutningen af udtryk"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3760,388 +3736,373 @@ msgstr "genopbyg omvendte databaselister ud fra installerede pakkehoveder"
 msgid "verify database files"
 msgstr "foresp�rg en spec-fil"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-"gener�r hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: ukendt m�rkenavn: \"%s\" ignoreret\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan ikke �bne '%s'-indeks ved brug af db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan ikke �bne '%s'-indeks\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "der er ikke sat nogen dbpath\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan ikke l�se hoved ved 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "fjerner \"%s\" fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "fjerne %d indgange fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 "tilf�jer \"%s\" til '%s'-indekset.\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "tilf�jer %d indgange til '%s'-indekset.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "der ikke sat nogen dbpath"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "genopbygger database %s over i %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "den midlertidige database %s eksisterer allerede\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 "opretter kataloget %s\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "opretter kataloget %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "�bner gammel database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "�bner ny database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "post nummer %d i databasen er fejlbeh�ftet -- overspringer.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kunne ikke tilf�je posten, der tidligere var ved %d\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "kunne ikke erstatte gammel database med ny database!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "erstat filer i %s med filer fra %s for at genoprette"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "fjerner kataloget %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "lukket  db-fil    %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "�bner   db-indeks %s/%s %s mode=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiv %d tom %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Overl�b i m�lbuffer\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makroen %%%s har et uafsluttet indhold (body)\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makroen %%%s har et ugyldig navn (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makroen %%%s har uafsluttede parametre\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makroen %%%s har intet indhold\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makroen %%%s kunne ikke udfoldes\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makroen %%%s har ugyldigt navn (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) blev ikke brugt under niveau %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Ukendt tilvalg %c i %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Rekursionsdybde(%d) overskrider maks(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Uafsluttet %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Et %% efterf�lges af en makro, der ikke kan tolkes\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Makroen %%%.*s blev ikke fundet, overspringer\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Fil %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Filen %s er mindre end %u byte\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- underst�ttes ikke for strenge\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- underst�ttes ikke for strenge\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite mislykkedes: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Succes"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Ugyldigt svar fra server"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "I/O-fejl for server"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Tidsudl�b for server"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Kunne ikke skaffe serverens IP-addresse"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Kunne ikke sl� serverens navn op"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Kunne ikke etablere en forbindelse til serveren"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Kunne ikke etablere en data-forbindelse til serveren"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "I/O-fejl i lokal fil"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Kunne ikke s�tte fjernserveren i passiv tilstand"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Fil ikke fundet p� server"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Afbryder programmet"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Ukendt eller uventet fejl"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "l�sning mislykkedes: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(ingen fejl)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "fatal fejl: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "fejl: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "advarsel: "
 
@@ -4150,44 +4111,81 @@ msgstr "advarsel: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "hukommelsesallokering (%u byte) returnerede NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url-port skal v�re et tal\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "verific�r pakkesignatur"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Signaturtilvalg"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: �bning mislykkedes: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: l�s manifest mislykkedes: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: l�s %s: %s\n"
+
+#, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Kunne ikke skrive hoved til %s: %s\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "fejl ved oprettelse af midlertidig fil %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "indpakningsversion 1 underst�ttes ikke af denne udgave af RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "kun indpakninger med hovedversion <= 4 underst�ttes af denne udgave af "
+#~ "RPM\n"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Ingen tilg�ngelig signatur (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Fil %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Filen %s er mindre end %u byte\n"
+
 #, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Ikke-tilfredsstillede afh�ngighedskrav for %s-%s-%s: "
diff --git a/po/de.po b/po/de.po
index cb692a0ff..af737121d 100644
--- a/po/de.po
+++ b/po/de.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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2005-07-08 17:21+0200\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -16,51 +16,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Fehlgeschlagene Paket-Abhängigkeiten:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Die Spec-Datei %s kann nicht geöffnet werden: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Die Tar-Pipe konnte nicht geöffnet werden: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Konnte Spec-Datei von %s nicht lesen\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Konnte %s nicht in %s umbenennen: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "Aufruf von stat für %s nicht möglich: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Die Datei %s ist keine normale Datei.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Die Datei %s scheint keine Spec-Datei zu sein.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Baue für die Zielplattform(en): %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Baue für das Ziel %s\n"
@@ -80,59 +80,59 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Abfrage-Optionen (mit -q oder --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Überprüfungsoptionen (mit -V oder --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr "Quell-Optionen (mit --query oder --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr "Optionen zum Durchlaufen des Dateibaumes (mit --ftswalk):"
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Signatur-Optionen:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Datenbank-Optionen:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Erstellungsoptionen mit [ <Spec-Datei> | <Tar-Archiv> | <Source-Paket> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Installations-/Aktualisierungs-/Deinstallationsoptionen:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Gemeinsame Optionen für alle RPM-Modi und Ausführungen:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM, Version %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -140,115 +140,115 @@ msgstr ""
 "Dieses Programm darf unter den Bedingungen der GNU GPL frei weiterverbreitet "
 "werden\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Interner Fehler beim Verarbeiten der Argumente (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "Nur ein wichtiger Modus kann angegeben werden"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "Unerwartete Abfrage-Parameter"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "Unerwartetes Abfrage-Format"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "Unerwartete Abfrage-Quelle"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "Nur Installation, Aktualisierung, \"rmsource\" und \"rmspec\" können "
 "erzwungen werden"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "Dateien können nur bei der Paket-Installation verschoben werden"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 "--prefix kann nicht zusammen mit --relocate oder --excludepath verwendet "
 "werden"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente für --prefix müssen mit einem / beginnen"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "entweder --excludedocs oder --includedocs darf angegeben werden"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches darf nur während der Paket-Deinstallation angegeben werden"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -256,7 +256,7 @@ msgstr ""
 "Optionen zum Deaktivieren von Skripten können nur während der Paket-"
 "Installation oder -Deinstallation angegeben werden"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -264,7 +264,7 @@ msgstr ""
 "Optionen zum Deaktivieren von Trigger können nur während der Paket-"
 "Installation oder -Deinstallation angegeben werden"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -272,7 +272,7 @@ msgstr ""
 "--nodeps darf nur während der Paket-Installation, -Deinstallation, -"
 "Überprüfung und -Erstellung angegeben werden"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -280,7 +280,7 @@ msgstr ""
 "--test darf nur während der Paket-Installation, -Deinstallation und -"
 "Erstellung angegeben werden"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -288,105 +288,105 @@ msgstr ""
 "--root (-r) darf nur während der Paket-Installation, -Deinstallation, -"
 "Abfragen und während Datenbank-Neuerstellungen angegeben werden"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente für --root (-r) müssen mit einem / beginnen"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "Keine Dateien zu signieren\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "Kann auf die Datei %s nicht zugreifen\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "PGP nicht gefunden: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Bitte das Passwort eingeben: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwort-Überprüfung ist fehlgeschlagen\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Ungültige %%_signature in der Makro-Datei.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign darf nur während der Paket-Erstellung benutzt werden"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "Ausführung fehlgeschlagen\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paket-Dateien für die Neuerstellung angegeben"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "Es wurde keine Spec-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "Es wurde keine Tar-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Abfrage angegeben"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "Es wurden keine Argumente angegeben"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Kann temporäre Datei nicht öffnen.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Ausführung(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Ausführung von %s fehlgeschlagen (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Fehler-Status beim Beenden von %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -445,92 +445,92 @@ msgstr "&& und || nicht unterstützt für Strings\n"
 msgid "syntax error in expression\n"
 msgstr "Syntax-Fehler im Ausdruck\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK fehlgeschlagen: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Fehlende '(' bei %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Fehlende ')' bei %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ungültiges %s Zeichen: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Fehlendes %s bei %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Druckbarem Zeichen folgt %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Ungültiger Syntax: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Ungültige Dateiberechtigungen: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Ungültige Verzeichnisberechtigungen: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Ungewöhnliche Länge der Lokalisierung \"%.*s\" in %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Doppelte Lokalisierung %.*s in %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Grenze für %%docdir erreicht\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Nur ein Argument für %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Zwei Dateien in einer Zeile: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Datei muss mit \"/\" beginnen: %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "%%doc kann nicht mit anderen Formaten gemischt werden: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Datei doppelt aufgelistet: %s\n"
@@ -560,7 +560,7 @@ msgstr "%s: Kann den unbekannten Tag (%d) nicht laden.\n"
 msgid "%s: public key read failed.\n"
 msgstr "%s: Lesen des öffentlichen Schlüssels fehlgeschlagen.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: Ist kein gepanzerter öffentlicher Schlüssel.\n"
@@ -580,7 +580,7 @@ msgstr "Datei benötigt führenden \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "\"Glob\" hat keine Berechtigung für: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datei von \"glob\" nicht gefunden: %s\n"
@@ -590,7 +590,7 @@ msgstr "Datei von \"glob\" nicht gefunden: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Datei %s aus %%files konnte nicht geöffnet: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "Zeile: %s\n"
@@ -600,7 +600,7 @@ msgstr "Zeile: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Ungültige Datei: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ungültiger Eigentümer/Gruppe: %s\n"
@@ -624,181 +624,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Verarbeite Paket: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: Zu viele Benutzer-IDs\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: Zu viele Benutzer-IDs\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: Zu viele Benutzer-IDs\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: Zu viele Gruppen-IDs\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: Zu viele Gruppen-IDs\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: Zu viele Gruppen-IDs\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Rechnername konnte nicht erkannt werden: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "Erstellen des Archivs fehlgeschlagen bei der Datei %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "Erstellen des Archivs fehlgeschlagen: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy schreiben fehlgeschlagen: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy lesen fehlgeschlagen: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Konnte PreIn-Datei nicht öffnen: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Konnte PreUn-Datei nicht öffnen: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Konnte PostIn-Datei nicht öffnen: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Konnte PostUn-Datei nicht öffnen: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Konnte VerifyScript-Datei nicht öffnen: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Konnte Trigger-Script nicht öffnen: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: Öffne %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: Lese %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek fehlgeschlagen: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ist kein RPM-Paket\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: Lese Header von %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Konnte keine unveränderliche Header-Region erstellen.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "Kann den temporären Header nicht schreiben\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Ungültige CSA-Daten\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Kann den entgültigen Header nicht schreiben\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Erzeuge Signatur: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Kann den Header der Signatur nicht erneut laden.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Konnte %s nicht öffnen: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kann das Paket nicht schreiben: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Konnte Signatur-Ziel %s nicht öffnen: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Konnte Header von %s nicht lesen: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Konnte Header nicht nach %s schreiben: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Konnte Nutzdaten von %s nicht lesen: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Konnte Nutzdaten nicht nach %s schreiben: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Erstellt: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Konnte den Dateinamen für das Paket %s nicht generieren: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Kann Datei %s nicht erstellen: %s\n"
@@ -808,32 +799,32 @@ msgstr "Kann Datei %s nicht erstellen: %s\n"
 msgid "line %d: second %s\n"
 msgstr "Zeile %d: Zweites %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "%%changelog-Einträge müssen mit einem * beginnen\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "Unvollständiger %%changelog-Eintrag\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "Ungültiges Datum im %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog ist nicht in absteigender Reihenfolge\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "Fehlender Name im %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "Keine Beschreibung im %%changelog\n"
@@ -843,17 +834,17 @@ msgstr "Keine Beschreibung im %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "Zeile %d: Fehler beim Parsen von %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "Zeile %d: Ungültige Option %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "Zeile %d: Zu viele Namen: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "Zeile: %d: Paket existiert nicht: %s\n"
@@ -863,211 +854,211 @@ msgstr "Zeile: %d: Paket existiert nicht: %s\n"
 msgid "line %d: Second description\n"
 msgstr "Zeile %d: Zweite Beschreibung\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "Zeile %d: Fehler beim Parsen von %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "Zeile %d: Zweite %%files-Liste\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architektur ist ausgeschlossen: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architektur ist nicht einbezogen: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "Betriebssystem ist ausgeschlossen: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "Betriebssystem ist nicht einbezogen: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "%s-Feld muss im Paket vorhanden sein: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Doppelte %s-Einträge im Paket: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Kann Icon %s nicht öffnen: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Kann Icon %s nicht lesen: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Unbekannter Icon-Typ: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "Zeile %d: Missgebildeter Tag: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "Zeile %d: Leerer Tag: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "Zeile %d: Ungültiges Zeichen '-' in %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "Der BuildRoot kann nicht \"/\" sein: %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, 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:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "Zeile %d: Das Epochen-Feld muss eine Zahl sein: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "Zeile %d: Ungültig %s: Kennzeichner: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "Zeile %d: Ungültiges BuildArchitecture-Format: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Interner Fehler: Falscher Tag %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr "Alter Syntax wird nicht mehr unterstützt: %s\n"
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ungültige Paket-Spezifikation: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket ist bereits vorhanden: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "Zeile %d: Unbekannter Tag: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec-Datei kann den BuildRoot nicht benutzen\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Ungültige Source: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Keine Patch-Nummer %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Keine Source-Nummer %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Konnte NoSource %s nicht herunterladen: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Fehler beim Parsen von %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "Zeile %d: Ungültiges Argument für %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "Zeile %d: Ungültige %%setup-Option %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "Zeile %d: Benötige Argument für %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "Zeile %d: Benötige Argument für %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "Zeile %d: Ungültiges Argument für %%patch -F: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "Zeile %d: Benötige Argument für %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "Zeile %d: Ungültiges Argument für %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Zu viele Patches!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "Zeile %d: Ungültiges Argument für %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "Zeile %d: Zweites %%prep\n"
@@ -1120,300 +1111,305 @@ msgstr "Zeile %d: Zweites %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "Zeite %d: Nicht unterstütztes internes Skript: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "Zeile %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Nicht geschlossenes %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean liefert %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else ohne %%if erhalten\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif ohne %%if erhalten\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "Missgebildete %%include-Anweisung\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Keine für das Bauen kompatible Architektur gefunden\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket hat keine %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "BuildRoot wurde bereits angegeben, ignoriere %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "%prep (Quellen entpacken, Patches übernehmen) der <Spec-Datei> durchlaufen"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<Spec-Datei>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 "%build (%prep, anschließendes Kompilieren) der <Spec-Datei> durchlaufen"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "%install (%prep, %build, anschließendes Installieren) der <Spec-Datei> "
 "durchlaufen"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "Überprüfe %files-Abschnitt der <Spec-Datei>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "Baue Source- und Binär-Paket von <Spec-Datei>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "Baue nur ein Binär-Paket von <Spec-Datei>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "Baue nur ein Source-Paket von <Spec-Datei>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "%prep (Quellen entpacken, Patches übernehmen) des <Tar-Archivs> durchlaufen"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<Tar-Archiv>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 "%build (%prep, anschließendes Kompilieren) des <Tar-Archivs> durchlaufen"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "%install (%prep, %build, anschließendes Installieren) des <Tar-Archivs> "
 "durchlaufen"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "Überprüfe %files-Abschnitt des <Tar-Archivs>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "Baue Source- und Binär-Paket vom <Tar-Archiv>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "Baue nur ein Binär-Paket vom <Tar-Archiv>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "Baue nur ein Source-Paket vom <Tar-Archiv>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "Baue ein Binär-Paket vom <Source-Paket>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<Source-Paket>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "%install (%prep, %build, anschließendes Installieren) des <Source-Pakets> "
 "durchlaufen"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "Überschreibe BuildRoot"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "Erstellungsdateibaum nach Beendigung löschen"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "Generiere mit RPM4-Paketen kompatible Header"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ExcludeArch ignorieren: Anweisungen der Spec-Datei"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "Debugge Datei-Status"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "Keine der Phasen des Erstellungsvorganges ausführen"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "Keine Überprüfung der Paket-Abhängigkeiten"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "Generiere Paket-Header, die mit veralteten RPM-Paketen (v2/3) kompatibel sind"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "Paket-Kurzfassung nicht überprüfen"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "Datenbank-Header beim Abrufen nicht überprüfen"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "Paket-Signatur(en) nicht überprüfen"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "Keine i18n-Übersetzungen der Spec-Datei zulassen"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "Quelldateien nach Beendigung löschen"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "Spec-Datei nach Beendigung löschen"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "Springe direkt zur angegeben Phase (nur für c, i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "Erstelle PGP-/GPG-Signatur"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "Überschreibe Zielplattform"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "i18n-Übersetzungen im Spec-Datei-Katalog nachschlagen"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+"Generiere Header, die mit veralteten RPM-Paketen (v2/3) kompatibel sind"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Konnte %s nicht ausführen: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Konnte fork %s nicht ausführen: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s fehlgeschlagen\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "Konnte nicht all Daten nach %s schreiben\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) fehlgeschlagen: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load fehlgeschlagen: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "magic_file(ms, \"%s\") fehlgeschlagen: mode %06o %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Finde %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Fehlgeschlagenes zu finden %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "Zeile %d: Ungültige Nummer: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "Zeile %d: Ungültige No%s-Nummer: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "Zeile %d: Ungültige %s Nummer: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s kann nicht abgefragt werden: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "Abfragen der Spec-Datei %s fehlgeschlagen, kann nicht geparst werden\n"
@@ -1459,52 +1455,52 @@ msgstr "Archiv-Datei nicht im Header"
 msgid " failed - "
 msgstr " fehlgeschlagen - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "Paket %s wurde bereits hinzugefügt, überspringe %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "Paket %s würde bereits hinzugefügt, ersetze es durch %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr "  Veraltetes: %s\t\tDeinstallationen %s\n"
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(zwischengespeichert)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib bietet an)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(Datenbank-Dateien)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(Datenbank bietet an)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "Ignoriere Paketnamensrelation(en) [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "Entferne %s \"%s\" von tsort-Relationen.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== zeichne tsort-Relationen auf\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
@@ -1512,26 +1508,26 @@ msgstr ""
 "========== tsorting Pakete (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== Nur Nachfolger (%d Bytes)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "SCHLEIFE:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== setze tsort fort...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder fehlgeschlagen, %d Elemente verbleiben\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(keine Nummer)"
 
@@ -1543,15 +1539,15 @@ msgstr "(nicht Base64)"
 msgid "(invalid type)"
 msgstr "(ungültiger Typ)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(kein Blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(ungültiger XML-Typ)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(keine OpenPGP-Signatur)"
 
@@ -1570,7 +1566,7 @@ msgstr "mntctl() lieferte keine Einhängepunkte: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "Aufruf von stat für %s nicht möglich: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s\n"
@@ -1585,12 +1581,12 @@ msgstr "%5d 0x%04x %s %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "Datei %s ist auf einem unbekannten Gerät\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 "========== Nicht ausdrücklich eingeschlossene Verzeichnisse im Paket:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1645,47 +1641,42 @@ msgstr "%s trennen von %s fehlgeschlagen: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s erstellt als %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "Füge %d Argumente aus Paket-Liste hinzu.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Kann %%%s %s nicht erstellen\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Kann nicht nach %%%s %s schreiben\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "Fehler beim erstellen der temporären Datei %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "Blob-Größe(%d): UNGÜLTIG, 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "Tag[%d]: UNGÜLTIG, Tag %d, Typ %d, Offset %d, Count %d\n"
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr "Regionsoffset: UNGÜLTIG, Tag %d, Typ %d, Offset %d, Count %d\n"
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr "Regionstrailer: UNGÜLTIG, Tag %d, Typ %d, Offset %d, Count %d\n"
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "Regionsgröße: UNGÜLTIG, ril(%d) > il(%d)\n"
@@ -1740,181 +1731,178 @@ msgstr "hdr Blob(%d): UNGÜLTIG, lesen lieferte %d zurück\n"
 msgid "hdr load: BAD\n"
 msgstr "hdr Load: UNGÜLTIG\n"
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "Paket-Version 1 wird von dieser RPM-Version nicht unterstützt\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"Nur Pakete mit Versionsnummern <= 4 werden von dieser RPM-Version "
-"unterstützt\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature fehlgeschlagen: %s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead fehlgeschlagen: %s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread fehlgeschlagen: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s ist ein Delta RPM und kann nicht direkt installiert werden\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nicht unterstütze Nutzlast (%s) in Paket %s\n"
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+#, fuzzy
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "FTS_COMFOLLOW: Folge symbolischen Links der Kommandozeile"
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+#, fuzzy
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "FTS_LOGICAL: Logischer Lauf"
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+#, fuzzy
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "FTS_NOCHDIR: Verzeichnisse nicht wechseln"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+#, fuzzy
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "FTS_NOSTAT: Keine Informationen beim Aufruf von stat"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+#, fuzzy
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "FTS_PHYSICAL: Physikalischer Lauf"
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+#, fuzzy
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "FTS_SEEDOT: Liefere Punkt und Punkt-Punkt zurück"
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+#, fuzzy
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "FTS_XDEV: Geräte nicht kreuzen"
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+#, fuzzy
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "FTS_WHITEOUT: Liefere Whiteout-Information"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "MAKRO mit Wert AUSDRUCK vordefinieren"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MAKRO AUSDRUCK'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "MAKRO mit Wert AUSDRUCK definieren"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "Makro-Ausdehnung des AUSDRUCKS anzeigen"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'AUSDRUCK'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "lese <DATEI:...> anstatt der Standard-Datei(en)"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<DATEI:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "Deaktiviere Benutzung der libio(3) API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "Sende Standardausgabe an CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "benutze WURZELVERZEICHNIS als oberstes Verzeichnis"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "WURZELVERZEICHNIS"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "Zeige bekannte Abfrage-Tags"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "Zeige entgültige rpmrc- und Makro-Konfiguration"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "Zeige weniger informative Ausgabe"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "Zeige detailliertere Ausgabe"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "Zeige benutzte RPM-Version"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "Debugge Nutzdaten-Dateistatus"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr "Benutze Thread für den Dateistatus"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "Debugge Verarbeitung der Optionen/Argumente"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "Debugge Paket-Status"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr "Benutze Threads für Paket-Status"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "Debugge rpmio Ein-/Ausgabe"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "Debugge Zwischenspeicher-Verwaltung der URLs"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: Optionstabelle ist falsch konfiguriert (%d)\n"
@@ -2340,7 +2328,7 @@ msgstr "Keine Überprüfung des Sicherheitskontexts"
 msgid "don't verify files in package"
 msgstr "Keine Überprüfung der Dateien im Paket"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "Keine Überprüfung der Paket-Abhängigkeiten"
 
@@ -2380,98 +2368,98 @@ msgstr "Signiere Paket(e) (identisch mit --addsign)"
 msgid "generate signature"
 msgstr "Erzeuge Signatur"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "Source-Paket erwartet, Binär-Paket entdeckt\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "Source-Paket enthält keine Spec-Datei\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d), rc %d, Status %x, %u.%03u Sekunden\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s.%s) führt ein <lua>-Skriptlet aus.\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s.%s) überspringt redundante(s) \"%s\".\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s.%s) %ssynchronous Skriptlet gestartet\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s), PID %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s.%s) Skriptlet fehlgeschlagen, waitpid(%d), rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s.%s) Skriptlet fehlgeschlagen, Signal %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s.%s) Skriptlet fehlgeschlagen, Beenden-Status %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s hat %d Dateien, Test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s Skriptlet fehlgeschlagen (%d), überspringe %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "Kann den Header der Signatur nicht erneut laden\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Entpacken des Archivs fehlgeschlagen%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " bei Datei "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s fehlgeschlagen bei Datei %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr "Versuche %s im Score-Board(%p) als installiert zu markieren.\n"
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr "Versuche %s im Score-Board(%p) als deinstalliert zu markieren.\n"
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "Ungültiges Format: %s\n"
@@ -2572,126 +2560,107 @@ msgstr "Nummer des Paket-Eintrags: %u\n"
 msgid "record %u could not be read\n"
 msgstr "Eintrag %u konnte nicht gelesen werden\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Das Paket %s ist nicht installiert\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(hinzugefügte Dateien)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(angebotene Fähigkeit hinzugefügt)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Öffnen fehlgeschlagen: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite fehlgeschlagen: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fflush fehlgeschlagen: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: ist kein RPM-Paket\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Kann keine v1-Pakete signieren\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Kann keine v2-Pakete erneut signieren\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: wurde bereits mit dem Schlüssel %s signiert, überspringe es\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead fehlgeschlagen: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature fehlgeschlagen: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: Importieren fehlgeschlagen (%d).\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: Importieren fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NICHT OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLÜSSEL:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (UNBESTÄTIGTE SCHLÜSSEL:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NEIN "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "JA"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2701,71 +2670,67 @@ msgstr ""
 "als \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Paket %s hat unerfüllte %s: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s durch \"missingok flag\" übersprungen\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== Verschiebungen\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d schließe %s aus\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d verschiebe %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "Ausschließen %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "Verschiebe %s nach %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Verschiebe Verzeichnis %s nach %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "Unbekannter Tag: \"%s\"\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Fehlgeschlagende Abhängigkeiten:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    Vorgeschlagene Auflösungen:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Vorbereiten..."
@@ -2790,105 +2755,120 @@ msgstr "Aktualisiere..."
 msgid "Upgrading packages..."
 msgstr "Aktualisiere Pakete..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "Füge Ziel hinzu: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Empfange %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... als %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kann nicht installiert werden\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "\tSource-Paket hinzugefügt [%d]\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr "Paket %s ist nicht verschiebbar\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "\tBinär-Paket hinzugefügt [%d]\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "Fehler beim Lesen von Datei %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "Die Datei %s benötigt eine neuere RPM-Version\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: Kein RPM-Paket (oder Paket-Liste): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d Source- und %d Binär-Pakete gefunden\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "Installiere Binär-Pakete\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Kann Datei %s nicht öffnen: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Kann %s nicht öffnen: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Rollback-Pakete (+%d/-%d) bis %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "Aufräumen bei neu gebauten Paketen:\n"
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\tEntferne %s:\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: ist kein RPM-Paket\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Keine Signatur verfügbar\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "Lesen fehlgeschlagen: %s (%d)\n"
@@ -2939,600 +2919,604 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "Interne Unterstützung für LUA-Skripte"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "Erstelle Transaktionsset"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "Erstelle Score-Board für Transaktionen(%p, %p)\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "unterschiedlich"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "Das Paket %s ist für die Architektur %s vorgesehen"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "Das Paket %s ist für das Betriebssystem %s vorgesehen"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "Das Paket %s ist bereits installiert"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "Der Pfad %s im Paket %s ist nicht verschiebbar"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 "Datei %s kollidiert zwischen den versuchten Installationen von %s und %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "Datei %s aus der Installation von %s kollidiert mit der Datei aus dem Paket %"
 "s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "Paket %s (welches neuer als %s ist) ist bereits installiert"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "Installation des Pakets %s benötigt %ld%cB auf dem %s Dateisystem"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "Installation des Pakets %s benötigt %ld Inodes auf dem %s Dateisystem"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s wird benötigt von %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(installiert) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s kollidiert mit %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "Unbekannter Fehler %d trat während dem Verarbeiten des Pakets %s auf"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "Fehlender zweiter ':' bei %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "Fehlender Architektur-Name bei %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Unvollständige Datenzeile bei %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Zu viele Argumente in der Datenzeile bei %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Ungültige Architektur/Betriebssystem-Nummer: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Unvollständige Standardzeile bei %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Zu viele Argumente in der Standardzeile bei %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Fehlgeschlagenes Lesen von %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "Fehlender ':' (0x%02x gefunden) bei %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "Fehlendes Argument für %s bei %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "Erweiterung von %s bei %s:%d \"%s\" fehlgeschlagen\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "Kann %s bei %s:%d nicht öffnen: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "Fehlende Architektur für %s bei %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "Ungültige Option '%s' bei %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Unbekanntes System: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr "Bitte (in Englisch) %s kontaktieren\n"
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kann %s nicht erweitern\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Kann %s nicht lesen, HOME ist zu groß.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kann %s nicht zum Lesen öffnen: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Kann Paket-Datenbank in %s nicht öffnen\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "Zusätzliche '(' im Paket-Label: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Fehlende '(' im Paket-Label: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "Fehlende ')' im Paket-Label: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "Kann Datenbank zum Auflösen in %s nicht öffnen\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Füge hinzu: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Schlage vor: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    Vorgeschlagene Auflösungen:\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "Eingehängte Dateisysteme:\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr "    i       Gerät   B-Größe     B verfügbar  I verf.  Einhängepunkt\n"
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%08x %8u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr "Erstelle Score-Board für Transaktionen(%p, %p)\n"
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr "\tScore-Board-Adresse:  %p\n"
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\tReserviere Speicherplatz für %d Einträge\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr "\tFüge Eintrag für %s zum Score-Board.\n"
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr "\t\tEinstiegsadresse:  %p\n"
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr "\tAktualisiere Eintrag für %s im Score-Board.\n"
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr "Möglicherweise freies Score-Board(%p)\n"
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr "\tRefcount ist null...ist frei\n"
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr "Schaue im Score-Board(%p) nach %s\n"
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr "\tEinstiegsadresse gefunden:  %p\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Erwartete Größe: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Aktuelle Größe: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "sigh-Größe(%d): UNGÜLTIG, lesen lieferte %d zurück\n"
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr "sigh Magic: UNGÜLTIG\n"
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr "sigh-Tags: UNGÜLTIG, Nummer der Tags (%d) außerhalb des Bereichs\n"
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr "sigh-Daten: UNGÜLTIG, Nummer der Bytes (%d) außerhalb des Bereichs\n"
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr "sigh-Blob(%d): UNGÜLTIG, lesen lieferte %d zurück\n"
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "sigh-Tag[%d]: UNGÜLTIG, Tag %d, Typ %d, Offset %d, Count %d\n"
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr "sigh-Load: UNGÜLTIG\n"
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr "sigh-Pad(%d): UNGÜLTIG, lese %d Byte\n"
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr "sigh sigSize(%d): UNGÜLTIG, fstat(2) fehlgeschlagen\n"
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatur: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Konnte %s nicht ausführen: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "PGP fehlgeschlagen\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "PGP konnte die Signatur nicht schreiben\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP-Signaturgröße: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "Konnte die Signatur nicht lesen\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "%d Byte der PGP-Signatur erhalten\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "GPG fehlgeschlagen (%d)\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "GPG konnte die Signatur nicht schreiben\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-Signaturgröße: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "%d Byte der GPG-Signatur erhalten\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Ungültige %%_signature-Spezifikation in der Makro-Datei\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "\"%%_gpg_name\" muss in der Makro-Datei gesetzt sein\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "\"%%_pgp_name\" muss in der Makro-Datei gesetzt sein\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "Header- und Nutzdaten-Größe: "
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "MD5-Kurzfassung: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "SHA1-Kurzfassung des Headers: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Header "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 msgid " signature: "
 msgstr " Signatur: "
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr " DSA-Signatur: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Überprüfe Signatur: UNGÜLTIGE PARAMETER\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Fehlerhafte MD5-Kurzfassung: NICHT UNTERSTÜTZT\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: UNBEKANNT (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "Schließe Verzeichnis %s aus\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr "Transaktion fehlgeschlagen...mache Rollback\n"
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr "Konnte Auto-Rollback-Transaktion nicht sortieren!\n"
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr "Hole erneut gepackten Header des Transaktionselements\n"
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\tSuche nach %s...\n"
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr "\tÜbereinstimmungen gefunden.\n"
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr "\tKeine Übereinstimmungen gefunden.\n"
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr "\tErneut gebautes Paket nicht gefunden.\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr "\tREMOVETID entspricht INSTALLTID.\n"
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\tName:  %s.\n"
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\tErneut gebautes Paket war %s...\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 "Installationselement zur Transaktion für das Auto-Rollback hinzugefügt.\n"
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr "Keine Datenbank-Instanz des Installationselements!\n"
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr "Keine Header der Transaktion für das Auto-Rollback!\n"
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\tErneut gepackten Paket-Header hinzugefügt: %s.\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr "\tVom Installationselement %s hinzugefügt.\n"
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr "\tDeinstallationselement hinzugefügt.\n"
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr "Kein erneut gepackter Header für Transaktion des Auto-Rollbacks!\n"
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 "Deinstallationselement für Transaktion des Auto-Rollbacks hinzufügen.\n"
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr "\tBereits vorhandenes Aktualisierungselement gefunden.\n"
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr "\tKein Deinstallationselement für %s hinzufügen.\n"
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\tErneut gepacktes Paket %s hinzugefügt.\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\tVom Deinstallationselement %s hinzugefügt.\n"
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 "Konnte das Deinstallationselement für Transaktion des Auto-Rollbacks nicht "
 "hinzufügen.\n"
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr "\tKein erneut gepacktes Paket...nichts zu tun.\n"
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr "Fehler beim Lesen des erneut gepackten Pakets!\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "Gesundheitsprüfung von %d Elementen\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr "Führe Pre-Transaktionsskripte aus\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "Berechne %d Datei-Fingerabdrücke\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "Berechne Dateianordnungen\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr "Erstelle Transaktion für ein Auto-Rollback\n"
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr "Hinzufügen fehlgeschlagen. Konnte den Paket-Header nicht lesen.\n"
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "Hinzufügen fehlgeschlagen bei rpmpsmStage().\n"
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr "Hinzufügen fehlgeschlagen. Konnte keine Dateiliste bekommen.\n"
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "Löschen fehlgeschlagen bei rpmpsmStage().\n"
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr "Führe Post-Transaktionsskripte aus\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr "fehlend   %c %s"
@@ -3541,60 +3525,60 @@ msgstr "fehlend   %c %s"
 msgid "Unknown system error"
 msgstr "Unbekannter System-Fehler"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d-Fehler (%d) von %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d-Fehler (%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "Closed   DB-Umgebung    %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "Removed  DB-Umgebung    %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "Offene   DB-Umgebung    %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "Closed   DB-Index       %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "Verified DB-Index       %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "Öffne    DB-Index       %s/%s %s Mode=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "Keine %s-Sperre auf %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "verteilt"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "Gesperrter  DB-Index    %s/%s\n"
@@ -3619,76 +3603,76 @@ msgstr "%s hat einen zu großen oder zu kleinen Wert, übersprungen\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s hat einen zu großen oder zu kleinen Integer-Wert, übersprungen\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "Fehlende { nach %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "Fehlende } nach %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "Leeres Tag-Format"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "Unbekannter Tag"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "Unbekannter Tag"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] erwartet am Ende des Arrays"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "Unerwartete ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "Unerwartete }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? im Ausdruck erwartet"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ nach dem ? im Ausdruck erwartet"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} im Ausdruck erwartet"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ": erwartet ein ? im Unterausdruck"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ nach dem : im Ausdruck erwartet"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| am Ende des Ausdrucks erwartet"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(Index außerhalb des Bereichs)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "Zählvariable wird mit ungleich großem Array benutzt"
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -3710,385 +3694,370 @@ msgstr ""
 msgid "verify database files"
 msgstr "Überprüfe Datenbank-Dateien"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-"Generiere Header, die mit veralteten RPM-Paketen (v2/3) kompatibel sind"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: Unbekannter Tag-Name: \"%s\" ignoriert\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, 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"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "Kann den %s-Index nicht öffnen\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "Kein Datenbank-Pfad wurde gesetzt\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "Fehler(%d) beim Lesen \"%s\"-Einträgen des %s-Indexes\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: Überspringe"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "Fehler(%d) beim Speichern des Eintrags #%d in %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: Überspringe"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: Beschädigten Header #%u erhalten -- überspringe.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: Kann den Header bei 0x%x nicht lesen\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur %s Entfernung\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Entferne \"%s\" aus dem %s-Index.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Entferne %d Einträge aus dem %s-Index.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, 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"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "Fehler(%d) beim Speichern des Eintrags \"%s\" in %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "Fehler(%d) beim Entfernen des Eintrags \"%s\" aus %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "Fehler(%d) beim Reservieren einer neuen Paket-Instanz\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: Überspringe"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "Füge \"%s\" zum %s-Index.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Füge %d Einträge zum %s-Index.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "Fehler(%d) beim Speichern des Eintrags %s in %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "Entferne %s nach erfolgreicher db3-Neuerstellung\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "Kein Datenbank-Pfad wurde gesetzt"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Baue Datenbank %s in %s neu\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "Temporäre Datenbank %s existiert bereits\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "Erstelle Verzeichnis %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "Erstelle Verzeichnis %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Öffne alte Datenbank mit dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Öffne neue Datenbank mit dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "Header #%u in der Datenbank ist ungültig -- überspringe.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "Kann ursprünglichen Eintrag %u nicht hinzufügen\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "Neu bauen der Datenbank fehlgeschlagen: Datenbank verbleibt entsprechend\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "Konnte die alte Datenbank nicht durch die neue ersetzen!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, 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"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "Entferne Verzeichnis %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Entfernen des Verzeichnisses %s fehlgeschlagen: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, c-format
 msgid "closed   sql db         %s\n"
 msgstr "Schließe   SQL-DB         %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "Öffne    SQL-DB         %s (%s) Mode=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiv %d  leer %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(leer)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(leer)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Überlauf des Zielpuffers\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s hat keinen terminierten Hauptteil\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s hat einen ungültigen Namen (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s hat keine terminierten Optionen\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s hat einen leeren Hauptteil\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s konnte nicht erweitert werden\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s hat einen ungültigen Namen (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) wurde nicht unter Level %d benutzt\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Unbekannte Option %c in %s (%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Rekursionstiefe (%d) ist größer als Maximum (%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Nicht terminiertes %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Ein %% ist gefolgt von einem nicht parsbaren Makro\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Makro %%%.*s nicht gefunden, überspringe\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Datei %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Datei %s ist kleiner als %u Byte\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "Ungültige Syntax in lua-Scriptlet: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "Ungültige Syntax in lua script: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua-Script fehlgeschlagen: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "Ungültige Syntax in lua-Datei: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua hook fehlgeschlagen: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Erfolg"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Ungültige Server-Antwort"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Ein-/Ausgabe-Fehler des Servers"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Server-Timeout"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Server-Adresse konnte nicht aufgelöst werden"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Server-Name konnte nicht aufgelöst werden"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Verbindung zum Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Aufbau einer Datenverbindung zum Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Ein-/Ausgabe-Fehler in lokale Datei"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Server-Fehler beim Wechseln in den passiven Modus"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Abbruch wird durchgeführt"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Unbekannter oder unerwarteter Fehler"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "Lesen fehlgeschlagen: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(kein Fehler)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "Schwerwiegender Fehler: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "Fehler: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "Warnung: "
 
@@ -4097,41 +4066,75 @@ msgstr "Warnung: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "Speicherbelegung (%u Byte) lieferte NULL zurück.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "URL-Port muss eine Zahl sein\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "Fehler beim Erstellen von %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "Keine Überprüfung der Header- und Nutzdaten-Signatur"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr "Cache-Datenbank nicht aktualisieren, nur Paket-Pfade ausgeben"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr "Optionen zum Durchlaufen des Dateibaumes:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: Makro %%{_cache_dbpath} ist falsch konfiguriert.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Cache-Operation(en) fehlgeschlagen: Fehler-Code %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Lesen der Paket-Liste fehlgeschlagen: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: Lese %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Kann den entgültigen Header nicht schreiben\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "Fehler beim erstellen der temporären Datei %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "Paket-Version 1 wird von dieser RPM-Version nicht unterstützt\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "Nur Pakete mit Versionsnummern <= 4 werden von dieser RPM-Version "
+#~ "unterstützt\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Kann keine v1-Pakete signieren\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Kann keine v2-Pakete erneut signieren\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Datei %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Datei %s ist kleiner als %u Byte\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Unerfüllte Abhängigkeiten für %s: "
diff --git a/po/es.po b/po/es.po
index 4ada02fca..87502bb89 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2006-04-28 09:52+1000\n"
 "Last-Translator: Manuel Ospina <mospina@redhat.com>\n"
 "Language-Team: Spanish <en@li.org>\n"
@@ -15,51 +15,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Falló la construcción de dependencias:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Incapaz de abrir archivo spec %s:%s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Falló la apertura de la tubería tar: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Falló la lectura del archivo spec desde %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Falló el renombramiento de %s a %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "falló stat %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "El archivo %s no es un archivo regular.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "El archivo %s no parece ser un specfile.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Construyendo la plataforma objetivo: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Construyendo para el objetivo %s\n"
@@ -79,60 +79,60 @@ msgstr "error al leer cabecera del paquete\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "no se puede abrir el contenido (payload): %s\n"
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Opciones de consulta (con -q o --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Opciones de verificación (con -V o --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "Opciones de verificación (con -V o --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Opciones de firma:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Opciones de base de datos:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Opciones de construcción con [ <specfile> | <tarball> | <paquete fuente> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opciones de Instalación/Actualización/Remoción:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opciones comunes para todos los modos y ejecutables:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versión %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -140,120 +140,120 @@ msgstr ""
 "Este programa puede ser redistribuido libremente bajo los términos de la "
 "licencia GNU GPL\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Error interno en el procesamiento de argumentos (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "solo puede especificarse un modo principal"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "un tipo de consulta/verificación puede ser ejecutado cada vez"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "opciones de consulta inesperadas"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "formato de consulta inesperado"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "fuente de consulta inesperado"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "solo las opciones de instalación, actualización, rmsource y rmspec pueden "
 "ser forzadas"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr ""
 "los archivos solo pueden ser reubicados durante la instalación de paquetes"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate y --excludepath solo pueden ser usados al instalar nuevos paquetes"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix solo puede ser usado al instalar nuevos paquetes"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "los argumentos de --prefix deber iniciar con /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) solo puede ser usado durante la instalación de paquetes"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "solo se puede especificar una opción: --excludedocs o --includedocs"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoresize solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches solo puede ser especificado durante la remoción de paquetes"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--allfiles solo puede ser especificado durante la instalación de paquetes"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb solo puede ser especificado durante la instalación y remoción de "
 "paquetes"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -261,7 +261,7 @@ msgstr ""
 "las opciones de desactivación de script solo pueden ser especificadas "
 "durante la instalación o eliminación del paquete."
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -269,7 +269,7 @@ msgstr ""
 "las opciones de desactivación de detonante solo pueden ser especificadas "
 "durante la instalación y borrado de paquetes"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -278,7 +278,7 @@ msgstr ""
 "reconstrucción, recompilación, instalación, remoción y verificación de "
 "paquetes"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -286,7 +286,7 @@ msgstr ""
 "--test solo puede ser especificado durante la instalación, remoción y "
 "construcción de paquetes"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -294,105 +294,105 @@ msgstr ""
 "--root (-r) solo puede ser especificado durante la consulta, base de datos, "
 "instalación y remoción de paquetes"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "los argumentos de --root (-r) deben iniciar con /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "ningún archivo para firmar\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "no se puede acceder al archivo %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "no se encontró la pgp:"
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Introduzca la contraseña:"
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Falló la verificación de la frase secreta\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "La frase secreta es correcta\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "%%_signature spec no válido en el archivo macro.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign solo puede ser utilizado durante la construcción de paquetes"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "ejecución fallida\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "ningún paquete dado para la reconstrucción"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "ningún archivo spec dado para la construcción"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "ningún archivo tar dado para la construcción"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "ningún paquete dado para la remoción"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "ningún paquete dado para la instalación"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "ningún argumento dado para la consulta"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "ningún argumento dado para la verificación"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "ningún argumento dado"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Incapaz de abrir archivo temporal.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Ejecutando(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Ejecución de %s fallida (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Estado de salida erróneo de %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -451,92 +451,92 @@ msgstr "&& y || no están soportados en cadenas\n"
 msgid "syntax error in expression\n"
 msgstr "error de sintaxis en la expresión\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "Fallo en TIMECHECK: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "'(' ausente en %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "')' ausente en %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Testigo (token) %s no válido: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s ausente en %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Ningún espacio en blanco después de %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Sintaxis errónea: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "modo spec erróneo: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "dirmode spec erróneo: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "tamaño de localización inusual: \"%.*s\" en %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Localización duplicada %.*s en %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Petición límite para %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Solo un argumento para %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dos archivos en una línea: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Los archivos deben iniciar con \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "No se puede mezclar %%doc especial con otros formatos: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Archivo listado dos veces: %s\n"
@@ -566,7 +566,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: falló la importación de lectura.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: no es una llave pública con armadura.\n"
@@ -586,7 +586,7 @@ msgstr "El archivo necesita \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob no está permitido: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "glob no encontró el archivo: %s\n"
@@ -596,7 +596,7 @@ msgstr "glob no encontró el archivo: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "No se pudo abrir el archivo %%files %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "línea: %s\n"
@@ -606,7 +606,7 @@ msgstr "línea: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Archivo erróneo: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "propietario/grupo erróneo: %s\n"
@@ -630,182 +630,173 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Procesando archivos: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: demasiados uid's\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: demasiados uid's\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: demasiados uid's\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: demasiados gid's\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: demasiados gid's\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: demasiados gid's\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "No se pudo canonicalizar el nombre de host: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "la creación del archivo falló en el fichero %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "creación de archivo fallido: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "escritura cpio_copy fallida: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "lectura cpio_copy fallida: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "No se pudo abrir el archivo PreIn: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "No se pudo abrir el archivo PreUn: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "No se pudo abrir el archivo PostIn: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "No se pudo abrir el archivo PostUn: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "No se pudo abrir el archivo VerifyScript: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "No se pudo abrir el archivo de script Trigger: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: abrir %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: leer %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek fallido: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s no es un paquete RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: leyendo cabecera desde %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Incapaz de crear región de cabecera inmutable.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "Incapaz de escribir cabecera temporal\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Data CSA erróneo\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Incapaz de escribir cabecera final\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generando la firma: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Incapaz de recargar cabecera de firma\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "No se pudo abrir %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Incapaz de abrir paquete: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Incapaz de abrir sigtarget %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Incapaz de leer cabecera de %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Incapaz de escribir cabecera a %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Incapaz de leer contenido en %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Incapaz de escribir contenido a %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Escrito: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 "No se pudo generar el nombre de archivo de salida para el paquete %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "No se puede crear %s: %s\n"
@@ -815,32 +806,32 @@ msgstr "No se puede crear %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "línea %d: segundo %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "entradas %%changelog deben iniciar con *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "entrada %%changelog incompleta\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "fecha errónea en %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog no está en orden cronológico descendente\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "nombre ausente en %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "ninguna descripción en %%changelog\n"
@@ -850,17 +841,17 @@ msgstr "ninguna descripción en %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "línea %d: Error al analizar %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "línea %d: Opción errónea %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "línea %d: Demasiados nombres: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "línea %d: El paquete no existe: %s\n"
@@ -870,210 +861,210 @@ msgstr "línea %d: El paquete no existe: %s\n"
 msgid "line %d: Second description\n"
 msgstr "línea %d: Segunda descripción\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "línea %d: Error al analizar %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "línea %d: Segunda lista de %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arquitectura excluida: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arquitectura no incluida: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "SO excluido: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "SO no incluido: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "el campo %s debe estar presente en el paquete: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Duplicar entradas %s en el paquete: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Incapaz de abrir icono %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Incapaz de leer icono %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo de icono desconocido: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "línea %d: la etiqueta solo recibe testigos individuales: %s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "línea %d: etiqueta mal formada: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "línea %d: Etiqueta vacía: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "línea %d: Carácter ilegal '-' en %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot no puede ser \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "línea %d: Prefijos deben finalizar en \"/\": %s\n"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "línea %d: Docdir debe iniciar con '/': %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "línea %d: campo Epoch/Serial debe ser un número: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "línea %d: %s erróneo: calificadores: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "línea %d: Formato BuildArchitecture erróneo: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Error interno: Etiqueta errónea %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Especificación de paquete erróneo: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "El paquete ya existe: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "línea %d: etiqueta desconocida: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "El archivo Spec no puede usar BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Fuente errónea: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Ningún número de parche %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Ningún número fuente %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "No se pudo descargar nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Error al analizar %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "línea %d: Argumento erróneo para %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "línea %d: opción %%setup errónea %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "línea %d: Se necesita argumento para %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "línea %d: Se necesita argumento para %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "línea %d: Argumento erróneo para %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "línea %d: Se necesita argumento para %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "línea %d: Argumento erróneo para %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "¡Demasiados parches!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "línea %d: Argumento erróneo para %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "línea %d: segundo %%prep\n"
@@ -1126,301 +1117,305 @@ msgstr "línea %d: Segundo %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "línea %d: Error al analizar %%description: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "línea %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Incapaz de abrir %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Sin cerrar %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean retornó %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Tiene un %%else sin %%if\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Tiene un %%endif sin %%if\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "declaración %%include malformada\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "No se encontraron arquitecturas compatibles para la construcción\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "El paquete no tiene %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot ya se especificó, ignorando %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "construir a través de %prep (desempaquetar fuentes y aplicar parches) desde "
 "<specfile>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<specfile>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "construir a través de %build (%prep, luego compilar) desde <specfile>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "construir a través de %install (%prep, %build, luego instalar) desde "
 "<specfile>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "verificar la sección %files de <specfile>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "construir paquetes binarios y fuente desde <specfile>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "construir paquetes binarios únicamente desde <specfile>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "construir paquete fuente únicamente desde <specfile>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "construir a través de %prep (desempaquetar fuentes y aplicar parches) desde "
 "<tarball>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "construir a través de %build (%prep, luego compilar) desde <tarball>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "construir a través de %install (%prep, %build, luego instalar) desde "
 "<tarball>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verificar sección %files desde <tarball>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "construir paquetes binarios y fuente desde <tarball>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "construir paquete binario únicamente desde <tarball>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "construir paquete fuente desde <tarball> "
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "construir paquete binario desde <source package>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<source package>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "construir a través de %install (%prep, %build, luego instalar) desde "
 "<paquete fuente>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "sobreescribir construcción de root"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "remover árbol de construcción al finalizar"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "generar cabeceras compatibles con el empaquetado rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignorar ExcludeArch: directiva del archivo spec"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "depurar archivo de la máquina de estado"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "no ejecutar ningún nivel de la construcción"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "no verificar dependencias de la construcción"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "generar cabeceras de paquetes compatibles con el empaquetamiento rpm[23] "
 "(legado)"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "no verificar resumen del paquete(s)"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "no verificar cabeceras de paquetes al recuperar"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "no verificar firma(s) del paquete"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "no aceptar msgstr i18N desde el specfile"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "remover fuentes al terminar"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "remover specfile al terminar"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "Ir a etapa especificada (solo para c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "generar firma PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "sobreescribir plataforma de destino"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "buscar cadenas i18N en el catalogo del specfile"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "generar encabezados compatibles con empaquetados rpm[23] (de legado)"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "No se pudo ejecutar %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "No se pudo bifurcar %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s fallido\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "falló la escritura de todos los datos a %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "la apertura de %s falló: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir de %s falló: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s rmdir de %s falló: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Buscando %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Falló la búsqueda de %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "línea %d: número erróneo: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "línea %d: %s número erróneo: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "línea %d: número %s erróneo: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "no se puede consultar %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "la consulta de specfile %s falló, no se pudo analizar\n"
@@ -1466,52 +1461,52 @@ msgstr "el fichero de archivo no está en cabecera"
 msgid " failed - "
 msgstr " fallido - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "el paquete %s ya fue añadido, reemplazando con %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "el paquete %s ya fue añadido, reemplazando con %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(en caché)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib proporciona)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(archivos db)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(db proporciona)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignorar relación de nombre de paquete [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "removiendo %s \"%s\" de relaciones tsort.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== grabando relaciones tsort\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1520,26 +1515,26 @@ msgstr ""
 "========== tsorting paquetes (orden, #predecesores, #sucesores, árbol, "
 "profundidad)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== sucesores únicamente (orden de presentación)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== continuando tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "falló rpmtsOrder, permanecen %d elementos\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(no es un número)"
 
@@ -1551,16 +1546,16 @@ msgstr "(no base64)"
 msgid "(invalid type)"
 msgstr "(tipo no válido)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(no es un blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 #, fuzzy
 msgid "(invalid xml type)"
 msgstr "(tipo no válido)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "(no es una firma OpenPGP"
@@ -1580,7 +1575,7 @@ msgstr "mntctl() falló al retornar puntos de montaje: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "falló stat %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "falló al abrir %s: %s\n"
@@ -1595,13 +1590,13 @@ msgstr "Archivo%5d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "el archivo %s está en un dispositivo desconocido\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 "========== Directorios que no están explicitamente incluidos en el paquete:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1657,47 +1652,42 @@ msgstr "%s desenlace de %s fallido: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s creado como %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "añadiendo %d entradas al índice %s\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "no se pudo crear %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "no se pudo escribir %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "error al crear el archivo temporal %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1752,193 +1742,181 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-"la versión de empaquetamiento 1 no está soportada por esta versión de RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"solo empaquetados con números mayores a <= 4 son soportados en esta versión "
-"de RPM\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature falló\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ninguna firma disponible\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead falló\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread falló: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s no puede ser instalado\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
+#: lib/poptALL.c:171
 #, fuzzy
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "seguir los enlaces simbólicos de la línea de comandos"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:173
 #, fuzzy
-msgid "FTS_LOGICAL: logical walk"
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "camino lógico"
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "no cambiar directorios"
 
-#: lib/poptALL.c:176
+#: lib/poptALL.c:177
 #, fuzzy
-msgid "FTS_NOSTAT: don't get stat info"
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "no obtener información stat"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:179
 #, fuzzy
-msgid "FTS_PHYSICAL: physical walk"
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "camino físico"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:181
 #, fuzzy
-msgid "FTS_SEEDOT: return dot and dot-dot"
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "retornar punto y dos puntos"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:183
 #, fuzzy
-msgid "FTS_XDEV: don't cross devices"
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "no cruzar dispositivos"
 
-#: lib/poptALL.c:184
+#: lib/poptALL.c:185
 #, fuzzy
-msgid "FTS_WHITEOUT: return whiteout information"
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "retorno sin información"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "predefine MACRO con valor EXPR"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "define MACRO con valor EXPR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "imprimir expansión de macro de EXPR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "leer <FILE:...> en vez del archivo(s) por defecto"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "desactivar uso de la API libio(3)"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "enviar stdout a CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "utilizar ROOT como el directorio superior"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "mostrar etiquetas de consulta conocidas"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "mostrar configuración rpmrc y macro final"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "proporcionar salida menos detallada"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "proporcionar salida más detallada"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "imprimir la versión de rpm que está siendo usada"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "depurar archivo de carga de la máquina de estado"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "depurar archivo de carga de la máquina de estado"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "depurar procesamiento de opción/argumento"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "depurar archivo de la máquina de estado"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "depurar archivo de carga de la máquina de estado"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "depurar E/S rpmio"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "depurar manipulación del caché URL"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: misconfiguración de la opción table (%d)\n"
@@ -2370,7 +2348,7 @@ msgstr "no verificar los archivos en el paquete"
 msgid "don't verify files in package"
 msgstr "no verificar los archivos en el paquete"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "no verificar las dependencias de paquetes"
 
@@ -2411,98 +2389,98 @@ msgstr "firmar paquete(s) (idéntico a --addsign)"
 msgid "generate signature"
 msgstr "generar firma"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "se esperaba el paquete fuente, paquete binario encontrado\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "el paquete fuente no contiene archivo .spec\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: ejecutando %s scriptlet\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: scriptlet %s fallido (%d), omitiendo %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s: scriptlet %s fallido (%d), omitiendo %s\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "ejecución de scriptlet %s de %s-%s-%s falló, estado de salida %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s tiene %d archivos, probar = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: scriptlet %s fallido (%d), omitiendo %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "Incapaz de recargar cabecera de firma\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "falló el desempaquetado de archivos %s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " en archivo"
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falló %s en archivo %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "falló %s: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "formato incorrecto: %s\n"
@@ -2603,126 +2581,107 @@ msgstr "número de registro de paquete: %u\n"
 msgid "record %u could not be read\n"
 msgstr "el registro %u no pudo ser leído\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "el paquete %s no está instalado\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(archivos añadidos)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(provisión añadida)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: falló la apertura: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile falló\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite falló: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek fallido: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: no es un paquete rpm\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: No se puede firmar empaquetado v1\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: No se puede re-firmar empaquetado v2\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: ya fue firmado por la llave ID %s, omitiendo\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead falló: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature falló: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: falló la importación de lectura.\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: falló la importación.\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead falló\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry falló\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: No hay firma disponible (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NO OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (LLAVES AUSENTES:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (LLAVES NO CONFIABLES:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NO "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "SI"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2732,71 +2691,67 @@ msgstr ""
 "\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "el paquete %s tiene %s no satisfechas: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s omitido debido a bandera missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== realocación\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d excluir %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d realocar %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "excluyendo %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "realocando %s a %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "realocando directorio %s a %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "la apertura de %s falló: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "etiqueta desconocida"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Error de dependencias:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "Resolución sugerida:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Preparando..."
@@ -2821,105 +2776,120 @@ msgstr "Actualizando..."
 msgid "Upgrading packages..."
 msgstr "Actualizando paquetes..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Buscando %s: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Recuperando %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... como %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "omitiendo %s - transferencia fallida - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s no puede ser instalado\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<source package>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "el paquete %s no es reubicable\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "instalando paquetes binarios\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "error al leer del archivo %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "el archivo %s requiere una version de RPM más reciente\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: no es un paquete rpm (o manifiesto de paquete): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "encontrados %d paquetes fuentes y %d binarios\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "instalando paquetes binarios\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "no se puede abrir el archivo %s:%s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" especifica varios paquetes\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "no se puede abrir %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalando %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Restaurar paquetes (+%d/-%d) a %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Recuperando %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: no es un paquete rpm\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: ninguna firma disponible\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "falló la lectura: %s  (%d)\n"
@@ -2972,603 +2942,607 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- no está soportado en cadenas\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "no se pudo obtener bloquear %s en %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "no se pudo obtener bloquear %s en %s/%s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "diferente"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "el paquete %s está destinado para la arquitectura %s"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "el paquete %s está destinado para el sistema operativo %s"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "el paquete %s ya está instalado"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "la ruta %s en el paquete %s no es reubicable"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "conflicto del archivo %s entre instalaciones intentadas de %s y %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "el archivo %s de la instalación de %s entra en conflicto con el archivo del "
 "paquete %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "el paquete %s (el cual es más nuevo que %s) ya está instalado"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 "la instalación del paquete %s necesita %ld%cB en el sistema de archivos %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "la instalación de paquete %s necesita %ld inodos en el sistema de archivos %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s se necesita para %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(instalado) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s entra en conflicto con %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 "se encontró el error desconocido %d mientras se manipulaba el paquete %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "segundo ':' omitido en %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "nombre de arquitectura omitida en %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "línea de datos incompleta en %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Demasiados argumentos en la línea de datos en %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "número de arq/os erróneo: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Línea determinada incompleta en %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Demasiados argumentos en la línea predeterminada en %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Falló la lectura de %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "':' faltante (se encontró 0x%02x) en %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "falta argumento para %s en %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "falló la expansión de %s a %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "no se puede abrir %s en %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "falta la arquitectura para %s en %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "opción errónea '%s' en %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Sistema desconocido: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr "Por favor contacte %s\n"
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "No se puede expandir %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "No se puede leer %s, HOME es demasiado grande.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Incapaz de abrir %s para lectura: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "no se puede abrir la base de datos Packages en %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "número de paquete inválido: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "'(' ausente en %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "número de paquete inválido: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "no se puede abrir la base de datos Solve en %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "línea: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Recuperando %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "Resolución sugerida:\n"
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "obteniendo la lista de los sistemas de archivos montados\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "realocando %s a %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "tamaño esperado: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "tamaño real: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Firma: tamaño(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No se pudo ejecutar %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "falló pgp\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "falló pgp al escribir la firma\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Tamaño de firma PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "incapaz de leer la firma\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "se obtuvieron %d bytes de la firma GPG\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "ejecución fallida\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "gpg falló al escribir la firma\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Tamaño de firma GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Se obtuvieron %d bytes de la firma GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "spec %%_signature no válido en archivo de macro\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Debe establecer \"%%_gpg_name\" en su archivo de macro\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Debe establecer \"%%_pgp_name\" en su archivo de macro\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "tamaño cabecera+carga:"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "Resumen MD5: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "resumen SHA1 de la cabecera:"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Cabecera"
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "Sin firma\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "Firma V3 DSA: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verificar firma: PARÁMETROS ERRÓNEOS\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Resumen MD5 incompleto: NO SOPORTADO\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Firma: DESCONOCIDA (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "excluyendo directorio %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "se esperaba el paquete fuente, paquete binario encontrado\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "ningún paquete coincide con %s: %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "error al leer cabecera del paquete\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, fuzzy, c-format
 msgid "sanity checking %d elements\n"
 msgstr "revisión de sanidad de %d elementos\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "computando %d hullas de archivo\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "calculando disposiciones del archivo\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "omitiendo  %c %s"
@@ -3578,60 +3552,60 @@ msgstr "omitiendo  %c %s"
 msgid "Unknown system error"
 msgstr "Sistema desconocido: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d error(%d) de %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d error(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "entorno db cerrado %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "entorno db removido %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "abriendo entorno db %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "índice db cerrado %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "índice db verificado %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "abriendo índice db %s/%s %s modo=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "no se pudo obtener bloquear %s en %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "exclusivo"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "compartido"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "índice db bloqueado %s/%s\n"
@@ -3658,76 +3632,76 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 "%s tiene un valor entero demasiado grande o demasiado pequeño, omitido\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "falta { después de %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "falta } después %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "formato de etiqueta vacío"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "nombre de etiqueta vacío"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "etiqueta desconocida"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] esperado al final del arreglo"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "] inesperado"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "} inesperado"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "se esperaba ? en la expresión"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "se esperaba { después de ? en la expresión"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "se esperaba } en la expresión"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "se esperaba : después de la subexpresión ?"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "se esperaba { después de : en la expresión"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "se esperaba | al final de la expresión"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3750,390 +3724,376 @@ msgstr ""
 msgid "verify database files"
 msgstr "verificar archivos de la base de datos"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "generar encabezados compatibles con empaquetados rpm[23] (de legado)"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nombre de etiqueta no reconocida: \"%s\" ignorado\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, 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"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "no se puede abrir índice %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "no se ha establecido dbpath\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "error(%d) obteniendo registros \"%s\" del índice %s\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 #, fuzzy
 msgid "miFreeHeader: skipping"
 msgstr "rpmdb: omitiendo"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "error(%d) almacenando registro #%d en %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 #, fuzzy
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdb: omitiendo"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: cabecera dañada #%u recuperada -- omitiendo.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: no se pudo leer cabecera en 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "error(%d) estableciendo registro de cabecera #%d para remoción %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "removiendo \"%s\" de índice %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "removiendo %d entradas de índice %s.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "error(%d) estableciendo registros \"%s\" desde índice %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "error(%d) almacenando registros \"%s\" en %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "error(%d) removiendo registro \"%s\" de %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "error(%d) asignando nueva instancia de paquete\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: omitiendo"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "añadiendo \"%s\" al índice %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "añadiendo %d entradas al índice %s\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "error(%d) almacenando registro %s en %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "removiendo %s después de reconstruir satisfactoriamente db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "no se ha establecido dbpath"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstruyendo base de datos %s en %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "la base de datos temporal %s ya existe\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "creando directorio %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "creando directorio %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "abriendo la antigua base de datos con dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "abriendo nueva base de datos con dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "cabecera #%u errónea en la base de datos -- omitiendo.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "no se puede añadir el registro original en %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 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"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 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"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, 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"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "removiendo el directorio %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falló la remoción del directorio %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "índice db cerrado %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "abriendo índice db %s/%s %s modo=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== activo %d vacío %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vacío)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vacío)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Desborde del buffer objetivo\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "El Macro %%%s tiene un cuerpo incompleto\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "El Macro %%%s tiene un nombre ilegal (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "la Macro %%%s tiene opciones no terminadas\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "La Macro %%%s tiene un cuerpo vacío\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr " Falló la expansión de la Macro %%%s\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "La Macro %%%s tiene un nombre ilegal (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "La Macro %%%s (%s) no fue utilizada bajo el nivel %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opción desconocida %c en %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 "La profundidad de recursión (%d) es mayor que el máximo permitido (%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "No terminado %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% está seguido por una macro no analizable\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "La Macro %%%.*s no se encontró, omitiendo\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Archivo %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "El archivo %s tiene menos de %u bytes\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "número de paquete inválido: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "número de paquete inválido: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite falló: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "número de paquete inválido: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "falló %s: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Éxito"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Respuesta errónea del servidor"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Error de E/S del servidor"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Server timeout"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Incapaz de buscar la dirección de host del servidor"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Incapaz de buscar el nombre de host del servidor"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Falló la conexión al servidor"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Falló el establecimiento de datos de conexión con el servidor"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Error de E/S al archivo local"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Error las establecer el servidor remoto en modo pasivo"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "El archivo no se encontró en el servidor"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Abandono en progreso"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Error inesperado o desconocido"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "falló la lectura: %s  (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(ningún error)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "Error fatal:"
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "error: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "advertencia:"
 
@@ -4142,44 +4102,80 @@ msgstr "advertencia:"
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "La asignación de memoria (%u bytes) retornó NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "puerto url debe ser un número\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "falló la creación de %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "no verificar firma de cabecera+carga"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 "no actualizar la base de datos de caché, imprimir rutas de paquetes "
 "únicamente"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Opciones de firma:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: %%{_cache_dbpath} configuración errónea de la macro.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: falló la operación de caché: ec %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: falló la lectura del manifiesto: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: leer %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Incapaz de escribir cabecera final\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "error al crear el archivo temporal %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr ""
+#~ "la versión de empaquetamiento 1 no está soportada por esta versión de "
+#~ "RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "solo empaquetados con números mayores a <= 4 son soportados en esta "
+#~ "versión de RPM\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: No se puede firmar empaquetado v1\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: No se puede re-firmar empaquetado v2\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: No hay firma disponible (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Archivo %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "El archivo %s tiene menos de %u bytes\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Dependencias no satisfechas para %s:"
diff --git a/po/fi.po b/po/fi.po
index 5d4374ee3..1b732a81a 100644
--- a/po/fi.po
+++ b/po/fi.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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -10,51 +10,51 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Puuttivia k��nn�sriippuvuuksia:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "En voi avata spec-tiedostoa %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "tar-putken avaus ep�onnistui: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Spec-tiedoston avaaminen %s:sta ep�onnistui\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Uudelleen nime�minen %s -> %s ep�onnistui: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Tiedosto %s ole tavallinen tiedosto\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Tiedosto %s ei vaikuta spec-tiedostolta\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "K��nnet��n kohteelle %s\n"
@@ -74,171 +74,171 @@ msgstr "virhe luettaessa otsikkotietoa paketista\n"
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Kyselyvalitsimet (-q tai --query yhteydess�)"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Tarkistusvalitsimet (-V tai --verify yhteydess�)"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr ""
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Allekirjoitusvalitsimet:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Tietokantavalitsimet:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "K��nn�svalitsimet:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Asennus-, p�ivitys- ja poistovalitsimet:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Yhteiset valitsimet kaikille rpm moodeille:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "T�t� ohjelmaa voi vapaasti levitt�� GNU GPL:n puittessa\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "vain yksi p��moodi voidaan m��ritell�"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "vain yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "odottamattomia kyselyvalintoja"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn muotoilu"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn l�hde"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vain asennus tai p�ivitys voidaan pakottaa"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirt�� toiselle polulle vain asennettaessa"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "--prefix valintaa ei voi k�ytt�� --relocate tai --excludepath kanssa"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate: voidaan k�ytt�� vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan k�ytt�� vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pit�� alkaa /-merkill�"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan k�ytt�� vain paketteja poistettaessa"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan k�ytt�� vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -246,7 +246,7 @@ msgstr ""
 "laukaisimien estovalintoja voidaan k�ytt�� vain paketteja asennettaessa tai "
 "poistettaessa"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -254,7 +254,7 @@ msgstr ""
 "--nodeps: voidaan k�ytt�� vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -262,7 +262,7 @@ msgstr ""
 "--test: voidaan k�ytt�� vain paketteja asennettaessa, poistettaessa ja "
 "k��nnett�ess�"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -270,105 +270,105 @@ msgstr ""
 "--root (-r): voidaan k�ytt�� vain paketteja asennettaessa, poistettaessa, "
 "kyselt�ess� ja tietokannan uudelleenluonnissa"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkill�"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "en voinut avata tiedostoa %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp:t� ei l�ytynyt"
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign: voidaan k�ytt�� vain paketteja k��nnett�ess�"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "suoritus ep�onnistui\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "uudelleenk��nnolle ei m��ritelty paketteja"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "k��nn�kselle ei annettu m��rittelytiedostoja"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "k��nn�kselle ei m��ritelty tar-tiedostoja"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "poistolle ei m��ritelty paketteja"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "asennukselle ei m��ritelty paketteja"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrej�"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrej�"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "ei annettu parametrej�"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "En voi avata v�liaikaistiedostoa.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Suoritetaan(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s:n suoritus ep�onnistui (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -426,92 +426,92 @@ msgstr "&& ja || ei tuettu merkkijoinoille\n"
 msgid "syntax error in expression\n"
 msgstr "syntaksivirhe lausekkeessa\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr ""
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "puuttuva ')' %s:(%s:ss�\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "virheellinen %s merkki: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "puuttuva %s %s %s:ss�\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Virheellinen syntaksi: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Virheellinen oikeusm��rittely %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Virheellinen hakemisto-oikeusm��rittely %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Ep�tavallinen locale-pituus: \"%.*s\" %%lang(%s):ss�\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
-#: build/files.c:887
+#: build/files.c:886
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Kaksi tiedostoa yhdell� rivill� %s: %s"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Tiedostojen t�ytyy alkaa \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Tiedosto lueteltu kahdesti: %s\n"
@@ -541,7 +541,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: julkisen avaimen luku ep�onnistui\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: ei ole panssaroitu julkinen avain.\n"
@@ -561,7 +561,7 @@ msgstr "Tiedosto tarvitsee aloitusmerkin \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "T�ydennys ei sallittu: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Tiedostoa ei l�ytynyt t�ydennyksell�: %s\n"
@@ -571,7 +571,7 @@ msgstr "Tiedostoa ei l�ytynyt t�ydennyksell�: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files tiedostoa %s ei voitu avata: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "rivi: %s\n"
@@ -581,7 +581,7 @@ msgstr "rivi: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Virheellinen tiedosto: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Virheellinen omistaja/ryhm�: %s\n"
@@ -605,181 +605,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "K�sitell��n tiedostoja: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "arkiston luominen ep�onnistui: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr ""
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr ""
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Luodaan allekirjoitusta: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:aa ei voitu avata: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Pakettia ei voitu kirjoittaa: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Otsikkotiedon lukeminen %s:st� ep�onnistui: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Otsikkotiedon kirjoittaminen %s:n ep�onnistui: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Kirjoitettiin: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voitu luoda %s:��: %s\n"
@@ -789,32 +780,32 @@ msgstr "en voitu luoda %s:��: %s\n"
 msgid "line %d: second %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr ""
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr ""
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr ""
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr ""
@@ -824,17 +815,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "rivi %d: virhe j�sennett�ess� %%description-osiota %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "rivi %d: virheellinen valinta %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "rivi %d: liikaa nimi�: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "line %d: pakettia %s ei ole olemassa: %s\n"
@@ -844,210 +835,210 @@ msgstr "line %d: pakettia %s ei ole olemassa: %s\n"
 msgid "line %d: Second description\n"
 msgstr "line %d: toinen %%description-osio\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "rivi %d: virhe j�sennett�ess� %%files-osiota: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "line %d: toinen %%files-osio\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arkkitehtuuri on poissuljettu: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arkkitehtuuri ei ole mukaanluettu: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "K�ytt�j�rjestelm� on poissuljettu: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "K�ytt�j�rjestelm� ei ole mukaanluettu: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "kentt� %s on vaadittu kentt� paketissa: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "rivi %d: laiton merkki '-' %s:ss�: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "rivi %d: Epoch/Serial-kent�n t�ytyy olla numero: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "rivi %d: virheellinen k��nn�sarkkitehtuurin muoto: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Virheellinen pakettim��rittely: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paketti on jo olemassa: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Virheellinen l�hde: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr ""
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Ei l�hdett� numero %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Virhe j�sennett�ess� %%setup-osiota: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "rivi %d: virheellinen argumentti %%setup:ille: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "rivi %d: virheellinen %%setup valitsin %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "rivi %d: virheellinen argumentti %%setup:ille: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr ""
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "rivi %d: toinen %%prep-osio\n"
@@ -1098,289 +1089,293 @@ msgstr "rivi %d: toinen %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "rivi %d: %s:\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ei voi avata %:��: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Ei yhteensopivia arkkitehtureeja k��nn�kselle\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketissa ei ole %%description-osiota: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr ""
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr ""
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr ""
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr ""
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr ""
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "poista k��nn�spuu, kun valmis"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr ""
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr ""
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr ""
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "�l� suorita mit��n k��nn�ksen vaiheita"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "�l� tarkista k��nn�sriippuvuuksia"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "�l� tarkista paketin allekirjoitusta"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr ""
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "poista l�hdekoodit kun valmis"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "poista m��rittelytiedosto kun valmis"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "siirry suoraan m��riteltyyn vaiheeseen (vain c ja i yhteydess�)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "generoi PGP/GPG-allekirjoitus"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr ""
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "En voinut ajaa pgp:t�"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "En voinut ajaa pgp:t�"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "pgp ep�onnistui"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "%s:n luonti ep�onnistui\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s:n poisto ep�onnistui: %s"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s:n poisto ep�onnistui: %s"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s:n luonti ep�onnistui\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "rivi %d: virheellinen numero: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "m��rittelytiedoston %s kysely ep�onnistui\n"
@@ -1426,77 +1421,77 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "paketti %s on jo lis�tty, ohitetaan %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paketti %s oli jo lis�tty, korvataan %s:lla\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr ""
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(ei ole luku)"
 
@@ -1508,15 +1503,15 @@ msgstr ""
 msgid "(invalid type)"
 msgstr "(virheellinen tyyppi)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr ""
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(ei ole OpenPGP-allekirjoitus)"
 
@@ -1535,7 +1530,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr ""
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "en voinut avata %s: %s\n"
@@ -1550,11 +1545,11 @@ msgstr ""
 msgid "file %s is on an unknown device\n"
 msgstr "tiedosto %s sijaitsee tuntemattomalla laitteella\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr ""
@@ -1609,47 +1604,42 @@ msgstr ""
 msgid "%s created as %s\n"
 msgstr "%s luotu %s:na\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr ""
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "virhe luotaessa tilap�ist� tiedostoa %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1704,183 +1694,170 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-#, fuzzy
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-"t�m� versio RPM:st� tukee vain suuremmman kuin 3 versionumeron paketteja\n"
-
-#: lib/package.c:726
-#, fuzzy
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"t�m� versio RPM:st� tukee vain suuremmman kuin 3 versionumeron paketteja"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr ""
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr ""
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s:�� ei voida asentaa\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr ""
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "l�het� vakiotuloste <komento>:lle"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "k�yt� <hakem> ylimp�n� hakemistona"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "n�yt� tunnetut kyselymuodot"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "tulosta k�ytetyn rpm:n versio"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr ""
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2302,7 +2279,7 @@ msgstr ""
 msgid "don't verify files in package"
 msgstr "�l� tarkista paketin tiedostoja"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "�l� tarkista paketin riippuvuuksia"
 
@@ -2342,98 +2319,98 @@ msgstr "allekirjoita paketti (hylk�� nykyinen allekirjoitus)"
 msgid "generate signature"
 msgstr "luo allekirjoitus"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr ""
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr ""
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "virheelinen muoto: %s\n"
@@ -2534,197 +2511,174 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr "tietuetta %u ei voitu lukea\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: avaus ep�onnistui: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
-msgstr ""
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
+msgstr "suoritus ep�onnistui\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: avaus ep�onnistui: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: ei ole RPM paketti\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: En voi allekirjoittaa v1.0 RPM:��\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:��\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVIA AVAIMIA:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EP�LUOTETTAVIA AVAIMIA:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "EI "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "KYLL� "
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "tuntematon nimi�: \"%s\"\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Puuttuvia riippuvuuksia:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Valmistellaan..."
@@ -2749,105 +2703,120 @@ msgstr "P�ivitet��n..."
 msgid "Upgrading packages..."
 msgstr "P�ivitet��n paketteja..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Haetaan %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "ohitetaan %s - siirto ep�onnistui - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s:�� ei voida asentaa\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr ""
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "virhe luettaessa tiedostosta %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "tiedosto %s vaatii uudemmat version RPM:st�\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: ei ole rpm paketti (tai pakettilista): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" m��ritt�� useita paketteja\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "virhe: en voi avata %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Asennetaan %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "Siivotaan uudelleenpaketoituja paketteja:\n"
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\tPoistetaan %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: ei ole RPM paketti\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Ei allekirjoitusta saatavilla\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "luku ep�onnistui: %s (%d)\n"
@@ -2892,593 +2861,597 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr ""
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "en voi saada %s lukitusta tietokantaan %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "en voi saada %s lukitusta tietokantaan %s/%s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "paketti %s on tarkoittettu %s-arkkitehtuurille"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "paketti %s on tarkoitettu %s-k�ytt�j�rjestelm�lle"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "paketti %s on jo asennettuna"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr ""
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paketti %s (joka on uudempi kuin %s) on jo asennettuna"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "paketin %s asennus tarvitsee %ld%c tavua tiedostoj�rjestelm�ll� %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "paketin %s tarvitsee %ld inodea tiedostoj�rjestelm�ll� %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr ""
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(asennettu) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s on ristiriidassa %s-%s:n kanssa"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "toinen ':' puuttuu, %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "puuttuva arkkitehtuurin nimi, %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ep�t�ydellinen datarivi, %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Liian monta parametri� datarivill� %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Virheellinen arkkitehtuuri/k�ytt�j�rjestelm� numero: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ep�t�ydellinen oletusrivi, %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Liian monta parametri� oletusrivill� %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "En voi lukea %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Tuntematon j�rjestelm�: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "En voi avata %s luettavaksi: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Pakettitietokantaa %s ei voida avata\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "Ratkaisutietokantaa %s ei voida avata\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Lis�t��n %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Ehdotetaan: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr ""
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr ""
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "en voinut lukea allekirjoitusta\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "gpg:n suoritus ep�onnistui (%d)\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "gpg ei voinut kirjoittaa allekirjoitusta\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Sinun pit�� asettaa \"gpg_name:\" makrotiedostossasi\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Sinun pit�� asettaa \"pgp_name:\" makrotiedostossasi\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 msgid " signature: "
 msgstr ""
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr ""
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr ""
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
@@ -3488,60 +3461,60 @@ msgstr ""
 msgid "Unknown system error"
 msgstr "Tuntematon j�rjestelm�: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "en voi saada %s lukitusta tietokantaan %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "jaettua"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
@@ -3566,76 +3539,76 @@ msgstr ""
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "puuttuva '{' '%':n j�lkeen"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "puuttuva '{' '%{':n j�lkeen"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "tyhj� nimi�n formaatti"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "tyhj� nimi�n nimi"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "tuntematon nimi�"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "']' puuttuu taulukkom��rittelyn lopusta"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "odottamaton ']'"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "odottamaton '}'"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "odotin '?'-merkki� ilmauksessa"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "odotin '{' '?'-merkin j�lkeen lausekkeessa"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "odotin '}'-merkki� lausekkeessa"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "odotin ':' '?'-merkin j�lkeen ali-lausekkeessa "
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "odotin '{' ':'-merkin j�lkeen lausekkeessa "
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "odotin '}'-merkki� ilmauksen lopussa"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3656,384 +3629,370 @@ msgstr ""
 msgid "verify database files"
 msgstr ""
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "dbpath ei ole asetettu\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "v�liaikainen tietokanta %s on jo olemassa\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "tietue numero %u tietokannassa viallinen -- ohitetaan.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr ""
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr ""
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr ""
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: avaus ep�onnistui: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Palvelimen osoitetta ei l�ytynyt"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Palvelimen nime� ei l�ytynyt"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Yhteyden muodostus palvelimeen ep�onnistui"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Datayhteyden muodostus palvelimeen ep�onnistui"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Paikallisen tiedoston IO-virhe"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Virhe asetettaessa palvelinta passiiviseen moodiin"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Tiedostoa ei l�ytynyt palvelimelta"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Tuntematon tai odottamaton virhe"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "luku ep�onnistui: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr ""
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "vakava virhe: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "virhe: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "varoitus: "
 
@@ -4042,41 +4001,65 @@ msgstr "varoitus: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url portin pit�� olla luku\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti ep�onnistui: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "virhe luotaessa tilap�ist� tiedostoa %s\n"
+
+#, fuzzy
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr ""
+#~ "t�m� versio RPM:st� tukee vain suuremmman kuin 3 versionumeron paketteja\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "t�m� versio RPM:st� tukee vain suuremmman kuin 3 versionumeron paketteja"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: En voi allekirjoittaa v1.0 RPM:��\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:��\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Tyydytt�m�tt�mi� riippuvuuksia %s:lle:"
diff --git a/po/fr.po b/po/fr.po
index 7e8f3095f..06603b5aa 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -19,51 +19,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Dépendances de construction manquantes:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Impossible d'ouvrir le fichier spec %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Impossible d'ouvrir le pipe de tar: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Impossible de lire le fichier spec à %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Impossible de renommer %s en %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "échec de stat sur %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Fichier %s non régulier.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Le fichier %s ne semble pas être un fichier spec.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Construction pour plate-formes cibles: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Construction pour cible %s\n"
@@ -83,61 +83,61 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Options de requêtes (avec -q ou --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Options de vérifications (avec -V ou --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "Options de vérifications (avec -V ou --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Otions de signatures"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Options de la base de données"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Options de construction avec [ <fichier_spec> | <tarball> | <paquetage "
 "source> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Options d'installation/désinstallation/mise à jour:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Options communes a tous les modes et executables rpm:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -145,112 +145,112 @@ msgstr ""
 "Ce programme peut être librement redistribué sous les termes de la licence "
 "GNU GPL\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Erreur interne au traitement de l'argument (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut être specifié"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "option de requête inattendue"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "format de requête inattendu"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "source de requête inattendue"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "seuls l'installation, la mise à jour, rmsource et rmspec peuvent être forcés"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "les fichiers ne peuvent être relogés qu'à l'installation"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "impossible d'utiliser --prefix avec --relocate ou --excludepath"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 "--prefix ne peut être utilisé qu'à l'installation de nouveaux paquetages"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --prefix doivent commencer par un /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "utiliser --excludedocs _OU_ --includedocs (pas les 2)"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches ne peut être utilisé qu'à la désinstallation de paquetages"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -258,7 +258,7 @@ msgstr ""
 "les options désactivant les scripts ne peuvent être utilisées qu'à la (dés)"
 "installation"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -266,7 +266,7 @@ msgstr ""
 "les options desactivant les triggers ne peuvent être utilisées qu'à la (dés)"
 "installation"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -274,14 +274,14 @@ msgstr ""
 "--nodeps ne peut être spécifié que pour la (re)construction, la "
 "recompilation, l'(dés)installation, et la vérification"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test ne peut être spécifié que pour la (dés)installation et la construction"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -289,105 +289,105 @@ msgstr ""
 "--root (-r) ne peut être utilisé que pour la (dés)installation, les requêtes "
 "et la reconstruction de la base de données"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments ed --root (-r) doivent commencer par un /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "aucun fichier à signer\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "ne peut accéder au fichier %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp non trouvé: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Entrez la phrase de passe: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Mauvaise phrase de passe\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Phrase de passe bonne.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "%%_signature invalide and le fichier de macros.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign est réservé à la construction d'un paquetage"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "echec de l'exec\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "aucun paquetage spécifié pour reconstruction"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "aucun fichier spec spécifié pour construction"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "aucun fichier tar spécifié pour construction"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "n'a aucun paquetage à désinstaller"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "n'a aucun paquetage à installer"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "aucun argument fourni à la requête"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "aucun argument fourni à la vérification"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "aucun argument fourni"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Incapable d'ouvrir un fichier temporaire.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Exécution_de(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "L'exec de %s a échoué (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Mauvais status de sortie pour %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -446,92 +446,92 @@ msgstr "&& et || ne sont pas supportés sur des chaînes de caractères\n"
 msgid "syntax error in expression\n"
 msgstr "erreur de syntaxe dans l'expression\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "échec du TIMECHECK: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "'(' manquante dans %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "')' manquante dans %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Lexème %s invalide: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s manquant(e) dans %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "espace non-blanc suivant %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Mauvaise syntaxe: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Mauvais mode spec: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Mauvais dirmode spec: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Mauvaise longueur de la locale: \"%.*s\" dans %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Deux fois la même locale %.*s dans %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limite atteinte pour %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Un seul argument pour %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Deux fichiers sur une seule ligne: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Le fichier doit commencer par \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Ne peut mélanger un %%doc spécial avec d'autre formes: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fichier listé deux fois: %s\n"
@@ -561,7 +561,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: échec de la lecture de la clé publique.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s n'est pas une clé publique blindée.\n"
@@ -581,7 +581,7 @@ msgstr "Le fichier non précédé d'un \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Substitution non permise: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fichier non trouvé par la substitution: %s\n"
@@ -591,7 +591,7 @@ msgstr "Fichier non trouvé par la substitution: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Ne peut ouvrir le fichier donné à %%files %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "Ligne: %s\n"
@@ -601,7 +601,7 @@ msgstr "Ligne: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Mauvais fichier: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Mauvais possesseur/groupe: %s\n"
@@ -625,181 +625,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Traitement des fichiers: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: trop d'uid\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: trop d'uid\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: trop d'uid\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: trop de gid\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: trop de gid\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: trop de gid\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Ne peut canoniser le nom d'hôte: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "impossible de créer l'archive %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "Echec de la création de l'archive: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "Echec d'écriture cpio_copy: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "Echec de lecture cpio_copy: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PreIn: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PreUn: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PostIn: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PostUn: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Impossible d'ouvrir le fichier VerifyScript: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Impossible d'ouvrir le fichier du script Trigger: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: ouverture de %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: lecture de %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: échec de fseek: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s n'est pas un paquetage RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: lecture de l'entête de %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Impossible de créer la partie immuable de l'entête.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "Impossible d'écrire un entête temporaire\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Mauvaises données CSA\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Impossible d'écrire l'entête définitif\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Génération de la signature: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Impossible de recharger l'entête de la signature.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Impossible d'écrire le paquetage: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Impossible d'ouvrir sigtarget %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Impossible de lire l'entête dans %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Impossible d'écrire l'entête dans %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Impossible de lire la charge utile dans %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Impossible d'écrire la charge utile dans %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Ecrit: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Ne peut générer le nom de fichier pour le package %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne peut créer %s: %s\n"
@@ -809,32 +800,32 @@ msgstr "Ne peut créer %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "ligne %d: deuxième %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "les entrées dans le %%changelog doivent commencer par *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "entrée de %%changelog incomplète\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "mauvaise date dans %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "le %%changelog n'est pas dans l'ordre chronologique descendant\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "nom manquant dans le %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "absence de description dans le %%changelog\n"
@@ -844,17 +835,17 @@ msgstr "absence de description dans le %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "ligne %d: erreur dans l'analyxe syntaxique de la %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "ligne %d: mauvaise option %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "ligne %d: trop de noms: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "ligne %d: package inexistant: %s\n"
@@ -864,210 +855,210 @@ msgstr "ligne %d: package inexistant: %s\n"
 msgid "line %d: Second description\n"
 msgstr "ligne %d: deuxième description\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "ligne %d: erreur dans l'analyse syntaxique de %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "ligne %d: deuxième liste %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architecture excluse: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architecture non incluse: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS exclus: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS non inclus: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "Le champ %s doit être présent dans le paquetage: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Entrée dupliquée %s dans le paquetage: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Impossible d'ouvrir l'icône %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Impossible de lire l'icône %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Type d'icône inconnu: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "ligne %d: tag malformé: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "ligne %d: tag vide: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "ligne %d: caractère '-' illégal dans %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot ne peut pas être \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, 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:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "ligne %d: le champ Epoch/Serial doit être un nombre: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "ligne %d: Mauvais %s: qualifiers: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "ligne %d: mauvais format pour BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erreur interne: tag bidon %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Mauvaise specification de paquetage: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paquetage déjà existant: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "ligne %d: tag inconnu: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Le fichier spec ne peut pas utiliser BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Mauvaise source: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Pas de numéro de patch %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Pas de numéro de source %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Impossible de télécharger la non-source %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Erreur d'analyse syntaxique du %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "ligne %d: mauvais argument à %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "ligne %d: mauvaise option à %%setup %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "ligne %d: %%patch -b a besoin d'un argument: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "ligne %d: %%patch -z a besoin d'un argument: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "ligne %d: mauvais argument à %%patch: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "ligne %d: %%patch -p a besoin d'un argument: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "ligne %d: mauvais argument à %%patch: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Trop de patchs !!!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "ligne %d: mauvais argument a %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "ligne %d: deuxième %%prep\n"
@@ -1120,305 +1111,309 @@ msgstr "ligne %d: deuxième %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "ligne %d: erreur dans l'analyxe syntaxique de la %%description: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "ligne %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if non terminé\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean retourne %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include malformé\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Pas d'architecture compatible pour construction\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Le paquetage n'a pas de %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot déjà spécifié, %s ignoré\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "construction jusqu'à la section %prep (deballage des sources et applications "
 "des patchs) du <fichier_spec>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<fichier_spec>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 "construction jusqu'à la section %build (%prep, et compilation) du "
 "<fichier_spec>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "construction jusqu'à la section %install (%prep, %build, et installation) du "
 "<fichier_spec>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "vérifier la section %files du <fichier_spec>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr ""
 "construire les paquetages sources et binaires à partir du <fichier_spec>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "construction du paquetage binaire seulement à partir du <fichier_spec>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "construction du paquetage source seulement à partir du <fichier_spec>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "construire jusqu'à la section %prep (déballage des sources et application "
 "des patchs) à partir du <tarball>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 "construire jusqu'à la section %build (%prep, puis compilation) à partir du "
 "<tarball>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "construire jusqu'à la section %build (%prep, %build, puis installation) à "
 "partir du <tarball>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "vérifier la section %files à partir du <tarball>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "construire les paquetages source et binaire à partir du <tarball>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "construire seulement le paquetage binaire à partir du <tarball>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "construire seulement le paquetage source à partir du <tarball>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "construire le paquetage binaire à partir du <paquetage source>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<paquetage source>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "construire jusqu'à la section %install (%prep, %build, et installation) à "
 "partir du <paquetage source>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "surcharger le buildroot"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "effacer l'arborescence de construction une fois terminé"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "générer un entête compatible avec l'emballage rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignorer les directives ExcludeArch: du fichier spec"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "déboguer la machine à états de fichiers (déballage)"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "n'exécuter aucune étape de la construction"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "ne pas vérifier les dépendances de construction"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "générer un(des) entête(s) compatible(s) avec l'emballage rpm[23]"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "ne pas vérifier les sommes de hachage du paquetage"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "ne pas vérifier l'entête de la base de données à la récupération"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "ne pas vérifier la(les) signature(s) du paquetage"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "ne pas accepter les msgstr de l'i18n du specfile"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "effacer les sources une fois terminé"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "effacer le fichier spec une fois terminé"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "aller directement à l'étape spécifiée (seulement pour c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "générer une signature PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "surcharger la plate-forme cible"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 "chercher les chaînes de caractères i18n dans le catalogue du fichier spec"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "générer un entête compatible avec l'emballage rpm[23]"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Impossible d'exécuter %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "échec %s: %s\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "Impossible d'écrire la charge utile dans %s: %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "échec de l'ouverture de %s: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s échec du rmdir sur %s: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s échec du rmdir sur %s: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Fichier %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Impossible de lire %s: %s.\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "ligne %d: mauvais nombre: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "ligne %d: mauvais numéro de no%s: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "ligne %d: mauvais numéro %s: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "ne peut faire la requête sur %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1466,53 +1461,53 @@ msgstr "L'entête ne contient pas le fichier archive"
 msgid " failed - "
 msgstr " échec - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "le paquetage %s a déjà été rajouté, replacé par %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "le paquetage %s a déjà été rajouté, replacé par %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(caché)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(fourni par rpmlib)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(fourni par fichiers db)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(fourni par la db)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 "ignorer la(les) relation(s) entre les noms de paquetages [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "on enlève %s \"%s\" des relations de Ttri.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== enregistrement des relations de Ttri\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1521,26 +1516,26 @@ msgstr ""
 "========== Ttri des paquetages (ordre, #prédécesseurs, #succeseurs, arbre, "
 "profondeur)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== successeurs seulement (%d octets)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "BOUCLE:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== continuation du Ttri ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "échec de rpmtsOrder, %d éléments toujours présents\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(n'est pas un nombre)"
 
@@ -1552,15 +1547,15 @@ msgstr "(pas base64)"
 msgid "(invalid type)"
 msgstr "(type invalide)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(spa un blob ça)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(type xml invalide)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(pas une signature OpenPGP)"
 
@@ -1579,7 +1574,7 @@ msgstr "mntctl() n'a pu renvoyer les points de montage: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "échec de stat sur %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
@@ -1594,12 +1589,12 @@ msgstr ""
 msgid "file %s is on an unknown device\n"
 msgstr "le fichier %s est sur un périphérique inconnu\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== Répertoires non explicitement inclus dans le paquetage:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr ""
@@ -1654,47 +1649,42 @@ msgstr "%s n'a pu délier %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s créé en tant que %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "rajout de %d entrées à l'index %s.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossible de créer %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'écrire dans %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "erreur en créant le fichier temporaire %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1749,192 +1739,180 @@ msgstr "hdr blob(%d): PASBON, la lecture renvoie %d\n"
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-"la version 1 de l'emballage n'est pas supportée par cette version de RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"seuls les emaballages avec un numéro de version majeur <= 4 sont supportés "
-"par cette version de rpm\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: échec de rpmReadSignature: %s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: aucune signature disponible\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead a échoué: %s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread a échoué: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s ne peut être installé\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
+#: lib/poptALL.c:171
 #, fuzzy
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "suivre les liens symboliques de la ligne de commande"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:173
 #, fuzzy
-msgid "FTS_LOGICAL: logical walk"
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "marche logique"
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "ne pas modifier les répertoires"
 
-#: lib/poptALL.c:176
+#: lib/poptALL.c:177
 #, fuzzy
-msgid "FTS_NOSTAT: don't get stat info"
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "ne pas prendre les info stat"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:179
 #, fuzzy
-msgid "FTS_PHYSICAL: physical walk"
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "marche physique"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:181
 #, fuzzy
-msgid "FTS_SEEDOT: return dot and dot-dot"
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "renvoyer point et point-point"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:183
 #, fuzzy
-msgid "FTS_XDEV: don't cross devices"
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "ne mélanger pas les périphériques"
 
-#: lib/poptALL.c:184
+#: lib/poptALL.c:185
 #, fuzzy
-msgid "FTS_WHITEOUT: return whiteout information"
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "ne pas renvoyer d'information"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "prédéfinir la MACRO avec l'EXPRression"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "definit MACRO ayant pour valeur EXPR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "affiche la macro-expansion d'EXPR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "Lire <FICHIER:...> au lieu du(des) fichier(s) par défaut"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<FICHIER:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "utilisation de l'API libio(3) désactivée"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "envoyer la sortie standard à CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "utiliser RACINE comme répertoire racine"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "RACINE"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "afficher les tags de requête connus"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "afficher la configuration finale des macros et rpmrc"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "afficher moins de détails"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "afficher plus de détails"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "afficher la version de rpm utilisé"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "déboguer la machine à états du fichier de la charge utile"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "déboguer la machine à états du fichier de la charge utile"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "déboguer le traitement des options/arguments"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "déboguer la machine à état du paquetage"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "déboguer la machine à état du paquetage"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "déboguer les E/S de rpmio"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "déboguer la manipulation de cache d'URL"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: table d'option mal configurée (%d)\n"
@@ -2382,7 +2360,7 @@ msgstr "ne pas vérifier les fichiers du paquetage"
 msgid "don't verify files in package"
 msgstr "ne pas vérifier les fichiers du paquetage"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "ne pas vérifier les dépendances du paquetage"
 
@@ -2423,98 +2401,98 @@ msgstr "signer le(s) paquetage(s) (identique à --addsign)"
 msgid "generate signature"
 msgstr "génération de signature"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "paquetage source attendu, paquetage binaire trouvé\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "le paquetage source ne contient pas de fichier .spec\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s) début du scriplet %ssynchrone\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s) redondance ignorée \"%s\".\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s) début du scriplet %ssynchrone\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s) échec du scriptlet, waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s avait %d fichiers, test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: échec du scriptlet %s (%d), on saute %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "Impossible de recharger l'entête de signature\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "échec du déballage de l'archive %s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " dans fichier "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "échec de %s sur le fichier %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "échec %s: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "format incorrect: %s\n"
@@ -2616,126 +2594,107 @@ msgstr "numéro d'article de paquetage: %u\n"
 msgid "record %u could not be read\n"
 msgstr "impossible de lire l'article %u\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "le paquetage %s n'est pas installé\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(fichiers ajoutés)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(fourniture ajoutée)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: échec de l'ouverture: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "échec de makeTempFile\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: échec de Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: échec de fseek: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: n'est pas un paquetage rpm\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: ne peut signer un emballage v1\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: ne peut resigner un emballage v2\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: déjà signé par la clé d'ID %s, ignoré\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: échec de writeLead: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: échec de rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: échec de la lecture d'import.\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: échec de l'import.\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: échec de headerRead\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: échec de headerGetEntry\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Aucune signature disponible (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "PAS OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (CLES MANQUANTES:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CLES NONCREDIBLE:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NON"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "OUI"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2745,71 +2704,67 @@ msgstr ""
 "pour \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "le paquetage %s a un(e) %s non-satisfaites: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignoré à cause du drapeau missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== relogements\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d exclus  %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d reloge %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "exclusion de %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relogement de %s vers %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relogement du répertoire %s vers %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "échec de l'ouverture de %s: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "tag inconnu: \"%s\"\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Dépendances requises:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    Résolutions suggérées:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Préparation...              "
@@ -2834,106 +2789,121 @@ msgstr "Mise à jour..."
 msgid "Upgrading packages..."
 msgstr "Mise à jour des paquetages..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "Nouveau but: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Récupération de %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... en tant que %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ignoré - échec du téléchargement - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ne peut être installé\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<paquetage source>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "le paquetage %s n'est pas relogeable\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installation des paquetages binaires\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erreur en lisant %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "le fichier %s demande une version plus récente de RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: n'est pas un paquetage rpm (ni une list de paquetages): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d paquetage(s) source(s) et %d paquetage(s) binaire(s) trouvé(s)\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "installation des paquetages binaires\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ne peut ouvrir le fichier %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spécifie plusieurs paquetages\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installation de %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 "Roulement arrière des paquetages (+%d/-%d) jusqu'à %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Récupération de %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: n'est pas un paquetage rpm\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: aucune signature disponible\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "échec de lecture: %s (%d)\n"
@@ -2988,607 +2958,611 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- non supporté sur des chaînes de caractères\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "impossible d'avoir le verrou %s sur %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "impossible d'avoir le verrou %s sur %s/%s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "différent"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "le paquetage %s est prévu pour une archicture %s"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "le paquetage %s est prévu pour le système d'exploitation %s"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "paquetage %s déjà installé"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "le chemin %s du paquetage %s n'est pas relogeable"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 "le fichier %s entre en conflit avec les tentatives d'installation de %s et %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "le fichier %s de l'installation de %s entre en conflit avec le fichier du "
 "paquetage %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "le paquetage %s (plus récent que %s) est déjà installé"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 "installer le paquetage %s nécessite %ld%co sur le système de fichiers %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "installer le paquetage %s nécessite %ld i-noeuds sur le système de fichiers %"
 "s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s est nécessaire pour %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(déjà installé) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s entre en conflit avec %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "erreur %d inconnue rencontrée en manipulant le paquetage %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "il manque un second ':' à %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "architecture manquante à %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ligne de données incomplète à %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Trop d'arguments dans la ligne de données à %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Mauvais numéro d'arch/OS: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "valeur par défaut imcomplète à la ligne %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Trop d'arguments pour la valeur par défaut de la ligne %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Impossible de lire %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "':' manquant (trouvé 0x%02x) à %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "argument manquant pour %s à %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "échec de l'expansion de %s à %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "Impossible d'ouvrir %s à %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "architecture manquante pour %s à %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "mauvaise option '%s' à %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "système inconnu: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr "Contactez %s\n"
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Impossible d'expanser %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Impossible de lire %s, HOME trop gros.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Impossible d'ouvrir %s en lecture: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir la base de données Package dans %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "'(' supplémentaire dans le label du paquetage: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "'(' manquante dans le label du paquetage: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "')' manquante dans le label du paquetage: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "Impossible d'ouvrir la base de données Solve dans %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Ajout de: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Suggestion: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    Résolutions suggérées:\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "systèmes de fichiers montés:\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%04x %5u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "relogement de %s vers %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Taille attendue: %12d = tête(%d)+sigs(%d)+pad(%d)+données(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Taille actuelle: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "taille du sigh(%d): PASBON, la lecture retourne %d\n"
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr "sigh pad(%d): PASBON, %d octets lus\n"
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, fuzzy, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr "taille du sigh(%d): PASBON, la lecture retourne %d\n"
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signature: taille(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Impossible d'exécuter %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "échec de pgp\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp incapable d'écrire la signature\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Taille sig PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "impossible de lire la signature\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "J'ai %d octets de sig PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "echec de l'exec\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "échec de gpg à ecrire la signature\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Taille sig GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "J'ai %d octets de sig GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "%%_signature spécifiée invalide dans le fichier de macros\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, 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"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 "Vous devez affecter une valeur à \"%%_pgp_name\" dans votre fichier de "
 "macros\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "Taille de Entête+Charge_utile: "
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "Somme MD5: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "Hachage de l'entête SHA1: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Entête "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "signature V3 DSA: "
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "signature V3 DSA: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verification de signature: MAUVAIS PARAMETRES\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Somme MD5 erronée: NONSUPPORTE\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signature: INCONNUE (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "répertoire %s exclus\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "paquetage source attendu, paquetage binaire trouvé\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "aucun paquetage ne correspond à %s: %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<paquetage source>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<paquetage source>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "erreur dans la lecteur de l'entête du paquetage\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "vérification de santé de %d éléments\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "calcul de %d empreintes de fichier\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "calcul de la disposition des fichiers\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "manquant %c %s"
@@ -3598,60 +3572,60 @@ msgstr "manquant %c %s"
 msgid "Unknown system error"
 msgstr "système inconnu: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "erreur db%d(%d) de %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "erreur db%d(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "fermeture  db environnement %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "enlèvement db environnement %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "ouverture  db environnement %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "fermeture     index db    %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "vérif.     db index       %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "ouverture     index db    %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "impossible d'avoir le verrou %s sur %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "exclusif"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "partagé"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "verrouillage  index db    %s/%s\n"
@@ -3676,76 +3650,76 @@ msgstr "%s est une valeur 'long' trop petite ou trop grande, ignoré\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s est une valeur entière trop petite ou trop grande, ignoré\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "{ manquant après %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "} manquant après %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "tag format vide"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "tag name vide"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "tag inconnu"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] attendu à la fin du tableau"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "] innatendu"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "} innatendu"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? attendu dans l'expression"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ attendu après ? dans l'expression"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} attendu dnas l'expression"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ": attendu derrière la sous-expression de ?"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ attendu après : dans l'expression"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| attendu a la fin de l'expression"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(index hors bornes)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "itérateur de tableau utilisé avec des tableaux de tailles différentes"
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3768,388 +3742,374 @@ msgstr ""
 msgid "verify database files"
 msgstr "vérifier les fichiers de la base de données"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "générer un entête compatible avec l'emballage rpm[23]"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nom de tag non-reconnu: \"%s\" ignoré\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ne peut ouvrir l'index %s en utilisant db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "ne peut ouvrir l'index %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "aucun dbpath n'a été fourni\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erreur(%d) en attrapant les articles \"%s\" de l'index %s\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: on saute"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erreur(%d) en stockant l'article nº%d dans %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: on saute"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: l'entête nº%u endommagé a été téléchargé -- ignoré.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: impossible de lire l'entête à 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 "erreur(%d) en affectant l'article de l'entête nº%d pour l'enlèvement de %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "enlèvement \"%s\" à l'index %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "enlèvement de %d entrées à l'index %s.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "erreur(%d) en affectant les articles \"%s\" de l'index %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erreur(%d) en stockant l'article \"%s\" dans %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erreur(%d) en enlevant l'article \"%s\" de %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erreur(%d) en allouant une nouvelle instance de paquetage\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: on saute"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "rajout de \"%s\" à l'index %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "rajout de %d entrées à l'index %s.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erreur(%d) en stockant l'article %s dans %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "enlèvement de %s après la reconstruction réussie en db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "aucun dbpath fourni"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstruction de la base de données de %s en %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "la base de données temporarire %s existe déjà\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "création du répertoire %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "création du répertoire %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ouverture d'une vieille base de données avec dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ouverture d'une nouvelle base de données avec dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "l'entête nº%u dans la base de données n'est pas bon -- ignoré.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "impossible d'ajouter l'article qui était au départ à %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "Ne peut reconstruire la base de données: la base originale reste telle "
 "qu'elle est\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "Ne peut remplacer la vieille base de données par la nouvelle!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 "remplacer les fichiers dans %s avec les fichiers de %s pour faire une "
 "récupération"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "destruction du répertoire %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Ne peut détruire le répertoire %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "fermeture     index db    %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "ouverture     index db    %s/%s %s mode=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d actif(s) %d vide(s)\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vide)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vide)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Tampon cible en surcharge\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "La macro %%%s a un corps sans fin\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "La macro %%%s a un nom illégal (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "La macro %%%s a des options non-terminées\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "La macro %%%s a un corps vide\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "La macro %%%s ne peut être expansée\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "La macro %%%s a un nom illégal (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "La macro %%%s (%s) n'est plus utilisée en dessous du niveau %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Option inconnue %c dans %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Profondeur de récursion(%d) plus grande que le max(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c non terminé: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% est suivi d'une macro in-analysable\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Macro %%%.*s non trouvé, ignoré\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Fichier %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Le fichier %s est plus petit que %u octets\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, 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:466
+#: rpmio/rpmlua.c:467
 #, 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:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: échec de Fwrite: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "numéro de paquetage invalide: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: échec de fseek: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Succès"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Mauvaise réponse du serveur"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Erreur d'E/S avec le serveur"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Timeout du serveur"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Impossible de résoudre l'adresse IP du serveur"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Impossible de retrouver le nom d'hôte du serveur"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Impossible de se connecter au serveur"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Impossible d'établir une connexion de données avec le serveur"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "erreur d'E/S dans le fichier local"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Erreur en mettant le serveur distant en mode passif"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Fichier non trouvé sur le serveur"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Abandon en cours"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Erreur inconnue ou inattendue"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "échec de lecture: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(pas d'erreur)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "erreur fatale: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "erreur: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "attention: "
 
@@ -4158,44 +4118,79 @@ msgstr "attention: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "l'allocation de mémoire (%u octets) a retourné NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "le port dans l'url doit être un nombre\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "échec de la création de %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "ne pas vérifier la signature de l'entete+charge_utile"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 "ne pas mettre à jour le cache de la base de données, afficher seulement les "
 "chemins du paquetage"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Otions de signatures"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: la macro %%{_cache_dbpath} est mal configurée.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: échec de l'opération sur le cache: ec %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: échec de la lecture de la liste de paquetages: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: lecture de %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Impossible d'écrire l'entête définitif\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "erreur en créant le fichier temporaire %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr ""
+#~ "la version 1 de l'emballage n'est pas supportée par cette version de RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "seuls les emaballages avec un numéro de version majeur <= 4 sont "
+#~ "supportés par cette version de rpm\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: ne peut signer un emballage v1\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: ne peut resigner un emballage v2\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Aucune signature disponible (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Fichier %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Le fichier %s est plus petit que %u octets\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "dépendances non satisfaites pour %s: "
diff --git a/po/is.po b/po/is.po
index bf1b0f020..543ad5c6c 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -10,52 +10,52 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "gat ekki �tb�i� pakkaskilyr�i:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Get ekki opna� spec skr�na %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Gat ekki opna� p�pu � tar: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Gat ekki lesi� spec skr� fr� %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Gat ekki endurnefnt %s sem %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "gat ekki sko�a� %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Skr�in %s er ekki venjuleg skr�.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Skr�in %s vir�ist ekki vera specskr�.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "���i fyrir markkerfi: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "���i fyrir markkerfi %s\n"
@@ -75,290 +75,290 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr ""
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM �tg�fa %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "H�fundarr�ttur (C) 1998-2000 - Red Hat Inc"
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "�essu m� dreifa frj�lst samkv�mt skilm�lum GNU GPL"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Get ekki opna� tempi skr�.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Gat ekki keyrt %s (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -414,92 +414,92 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "vantar '(' �  %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "vantar ')' � %s %s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "�gilt %s t�kn: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "vantar '(' �  %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Tv�r skr�r � einni l�nu: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Skr�in er tv�tekin: %s\n"
@@ -529,7 +529,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -549,7 +549,7 @@ msgstr ""
 msgid "Glob not permitted: %s\n"
 msgstr "Gat ekki opna� PreUn skr�: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Skr�in fannst ekki me� 'glob': %s\n"
@@ -559,7 +559,7 @@ msgstr "Skr�in fannst ekki me� 'glob': %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Gat ekki opna� %%files skr�na %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "l�na: %s\n"
@@ -569,7 +569,7 @@ msgstr "l�na: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "�gild skr� %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
@@ -591,185 +591,175 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "safnskr�arsm�� br�st � skr� %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "safnskr�arsm�� br�st: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Gat ekki opna� PreIn skr�: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Gat ekki opna� PreUn skr�: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Gat ekki opna� PostIn skr�: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Gat ekki opna� PostUn skr�: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Get ekki opna� VerifyScript skr�: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr ""
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Get ekki lesi� haus �r %s: %s\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Gat ekki rita� haus � %s: %s\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "Gat ekki rita� haus � %s: %s\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Get ekki lesi� haus �r %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki rita� � pakka: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Get ekki opna� sigtarget %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Get ekki lesi� haus �r %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Gat ekki rita� haus � %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Get ekki lesi� innihald %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki rita� innihald � %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifa�i: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -779,32 +769,32 @@ msgstr ""
 msgid "line %d: second %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr ""
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr ""
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr ""
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr ""
@@ -814,17 +804,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "l�na %d: �leyfilegur rofi %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -834,210 +824,210 @@ msgstr ""
 msgid "line %d: Second description\n"
 msgstr ""
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr ""
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Get ekki opna� t�knmynd %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Gat ekki lesi� t�knmynd %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "��ekkt tegund t�knmyndar: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "l�na %d: Skemmt tag: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "l�na %d: T�mt tag: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "l�na %d: �l�glegt t�kn '-' � %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "l�na %d: Epoch/Serial sv��i� ver�ur a� innihalda t�lu: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Sl�mt �lag: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr ""
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr ""
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "l�na %d: �gilt vi�fang vi� %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "l�na %d: �gilt vi�fang vi� %%setup: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr ""
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1088,293 +1078,297 @@ msgstr ""
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "l�na %d: Skemmt tag: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "l�na %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Get ekki opna� %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot �egar skilgreind, hunsa %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr ""
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr ""
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr ""
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr ""
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr ""
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr ""
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr ""
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr ""
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr ""
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 #, fuzzy
 msgid "do not verify build dependencies"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr ""
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr ""
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr ""
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr ""
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Gat ekki b�i� til undirferli (fork) %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s br�st\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "gat ekki rita� �ll g�gn � %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "%s br�st\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir %s br�st: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s rmdir %s br�st: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Skr� %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "gat ekki fundi� %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr ""
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1420,77 +1414,77 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "get ekki opna� pakka gagnagrunn �\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr ""
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr ""
 
@@ -1502,15 +1496,15 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr ""
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "b�a til undirskrift"
@@ -1530,7 +1524,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr "gat ekki sko�a� %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "gat ekki opna� %s: %s\n"
@@ -1545,11 +1539,11 @@ msgstr "Skr� %s: %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr ""
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
@@ -1604,47 +1598,42 @@ msgstr "%s gat ekki eytt %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s b�i� til sem %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr ""
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "gat ekki b�i� til %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki rita� � %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr ""
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1699,181 +1688,172 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s rmdir %s br�st: %s\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr ""
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "prenta �tv�kkun fj�lva <expr>+"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "senda fr�lag � <skipun>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "s�na endanlega rpmrc og stillingar fj�lva"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "prenta �tg�fun�mer rpm sem veri� er a� nota"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr ""
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2302,7 +2282,7 @@ msgstr "ekki yfirfara skr�rnar � pakkanum"
 msgid "don't verify files in package"
 msgstr "ekki yfirfara skr�rnar � pakkanum"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "ekki sko�a pakkaskilyr�in"
 
@@ -2346,99 +2326,99 @@ msgstr ""
 msgid "generate signature"
 msgstr "b�a til undirskrift"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skr�\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr ""
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr ""
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Get ekki lesi� haus �r %s: %s\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opna� %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s br�st\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
@@ -2539,198 +2519,175 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
-msgstr ""
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
+msgstr "pgp br�st\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "get ekki opna� pakka gagnagrunn �\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: gat ekki lesi� manifest: %s\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "get ekki opna� pakka gagnagrunn �\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d f�ra %s -> %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d f�ra %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "l�na %d: %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "%5d f�ra %s -> %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%5d f�ra %s -> %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "��ekkt tegund t�knmyndar: %s\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "gat ekki �tb�i� pakkaskilyr�i:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr ""
@@ -2756,105 +2713,120 @@ msgstr ""
 msgid "Upgrading packages..."
 msgstr "uppf�ra pakka"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Skr� %s: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "Get ekki rita� � pakka: %s\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "Skr�in %s er ekki venjuleg skr�.\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "get ekki opna� pakka gagnagrunn �\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr ""
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "get ekki opna� pakka gagnagrunn �\n"
+
+#: lib/rpmlead.c:103
+#, c-format
+msgid "%s: illegal signature type\n"
+msgstr ""
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr ""
@@ -2899,595 +2871,599 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr ""
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr ""
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr ""
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr ""
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr ""
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr ""
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr ""
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "vantar seinni ':' � %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Get ekki lesi� %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "vi�fang vantar fyrir %s � %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "get ekki opna� %s � %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "�l�glegur rofi '%s' � %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Get ekki opna� %s til lesturs: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opna� pakka gagnagrunn � %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "vantar '(' �  %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "vantar '(' �  %s %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "get ekki opna� pakka gagnagrunn � %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "l�na: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "Skr� %s: %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "%5d f�ra %s -> %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp br�st\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp gat ekki lesi� undirskriftina\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "get ekki lesi� undirskriftina\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "ggp br�st\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "gpg get ekki lesi� undirskriftina\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "ekki yfirfara SHA1 undirritunina"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "b�a til undirskrift"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr ""
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "get ekki opna� pakka gagnagrunn �\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "Get ekki rita� � pakka: %s\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "Get ekki rita� � pakka: %s\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr ""
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "vantar     %s"
@@ -3497,60 +3473,60 @@ msgstr "vantar     %s"
 msgid "Unknown system error"
 msgstr "��ekkt e�a �v�nt villa"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "loka�i gagnagrunnsumhverfi %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "fjarl�g�i gagnagrunnsumhverfi %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "opna gagnagrunnsumhverfi %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "einka"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "deildann"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
@@ -3575,76 +3551,76 @@ msgstr ""
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr ""
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr ""
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr ""
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3665,383 +3641,369 @@ msgstr ""
 msgid "verify database files"
 msgstr ""
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "get ekki opna� %s index me� db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "get ekki opna� %s index\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, c-format
 msgid "closed   sql db         %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr ""
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== virkt %d t�mt %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(t�mt)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(t�mt)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr ""
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "��ekkt vi�fang %c � %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Fj�lvi %%%.*s fannst ekki. Sleppi\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Skr� %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Skr�in %s er minni en %u b�ti\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s br�st\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "T�kst"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "�j�nninn svara�i rangt"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Les/ritvilla � �j�ninum"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "�j�nninn t�ma�i �t"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Gat ekki flett upp vistfangi �j�nsins"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Gat ekki flett upp heiti �j�nsins"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Gat ekki tengst �j�ninum"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Gat ekki opna� gagnatengingu vi� �j�ninn"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Les/ritvilla � skr�na"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Ekki t�kst a� f� �j�ninn � \"passive\" ham"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Skr�in fannst ekki � �j�ninum"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Er a� h�tta vi�"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "��ekkt e�a �v�nt villa"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "ggp br�st\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(engin villa)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "banv�n villa: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "villa: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "a�v�run: "
 
@@ -4050,43 +4012,53 @@ msgstr "a�v�run: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "minnisfr�tekt (%u b�ta) skila�i NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "g�tt sl��ar ver�ur a� vera tala\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "gat ekki b�i� til %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s rmdir %s br�st: %s\n"
 
 #, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Gat ekki rita� haus � %s: %s\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Skr� %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Skr�in %s er minni en %u b�ti\n"
+
+#, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "�uppfyllt pakkaskilyr�i fyrir %s-%s-%s: "
diff --git a/po/it.po b/po/it.po
index c560e71ba..4e352d42d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2006-04-28 06:25+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <it@li.org>\n"
@@ -15,51 +15,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Compilazione dipendenze fallita:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Impossibile aprire il file spec %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Impossibile aprire tar pipe: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Impossibile leggere il file spec da %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Impossibile rinominare %s in %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "impossibile visualizzare statistiche per %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Il file %s non è un file regolare.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Il file %s non sembra essere uno pecfile.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Creazione piattaforma target in corso: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Creazione per il target %s in corso\n"
@@ -79,61 +79,61 @@ msgstr "errore durante la lettura dell'intestazione dal pacchetto\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "impossibile riaprire payload: %s\n"
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Opzioni d'interrogazione (con -q o --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Opzioni di verifica (con -V o --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "Opzioni di verifica (con -V o --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Opzioni della firma:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Opzioni del database:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Opzioni di compilazione 'Build' con [ <specfile> | <tarball> | <source "
 "package> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opzioni Installa/Aggiorna/Rimuovi:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opzioni comuni per tutte le modalità rpm ed eseguibili:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "Versione RPM %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -141,128 +141,128 @@ msgstr ""
 "Questo programma può essere ridistribuito liberamente sotto i termini della "
 "GNU GPL\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Errore interno durante la processazione dell'argomento (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "è possibile specificare solo una modalità principale"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "flag d'interrogazione inaspettate"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "formato d'interrogazione inaspettato"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "origine d'interrogazione inaspettata"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "è possibile forzare solo i processi d'installazione, aggiornamento rmsource "
 "e rmspec"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr ""
 "i file possono essere riposizionati solo durante l'installazione del "
 "pacchetto"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix può essere usato solo quando si installano nuovi pacchetti"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "gli argomenti per --prefix devono iniziare con /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs può essere specificato solo durante l'installazione del "
 "pacchetto"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs può essere specificato solo durante l'installazione del "
 "pacchetto"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs può essere specificato solo durante l'installazione del "
 "pacchetto"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "è possibile specificare solo uno tra  --excludedocs e --includedocs"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch può essere specificato solo durante l'installazione del "
 "pacchetto"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoresize può essere specificato solo durante l'installazione del "
 "pacchetto"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches può essere specificato solo durante la rimozione del pacchetto"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--allfiles può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 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"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -270,7 +270,7 @@ msgstr ""
 "le opzioni per la disabilitazione dello script possono essere specificate "
 "solo durante l'installazione e la rimozione del pacchetto"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -278,7 +278,7 @@ msgstr ""
 "le opzioni di disabilitazione dell' attivazione possono essere specificate "
 "solo durante l'installazione e la rimozione del pacchetto"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -286,7 +286,7 @@ msgstr ""
 "--nodeps può essere specificato solo durante la creazione, ricreazione, "
 "ricompilazione, installazione, eliminazione e verifica del pacchetto"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -294,7 +294,7 @@ msgstr ""
 "--test può essere specificato solo durante l'installazione, rimozione e "
 "creazione del pacchetto"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -302,105 +302,105 @@ msgstr ""
 "--root (-r) può essere specificato solo durante l'installazione, la "
 "rimozione, l'interrogazione e nei processi di ricreazione del database"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "gli argomenti per --root (-r) devono iniziare con /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "nessun file da firmare\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "impossibile accedere il file %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp non trovato: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Inserire la frase chiave:"
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Controllo frase chiave fallito\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "La frase chiave risulta valida.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Spec %%_signature invalida nel file macro.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "è possibile usare --sign solo durante la compilazione del pacchetto"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "exec fallito\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "non è stato specificato alcun file del pacchetto per la ricompilazione"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "non è stato specificato alcun file spec per la compilazione"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "non è stato specificato alcun file tar per la compilazione"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "non è stato specificato alcun pacchetto per la rimozione"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "non è stato specificato alcun pacchetto per l'installazione"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "non è stato specificato alcun argomento per l'interrogazione"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "non è stato specificato alcun argomento per la verifica"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "non è stato specificato alcun argomento"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Impossibile aprire il file temp.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Esecuzione(%s) in corso: %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Esecuzione di %s fallita (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Stato d'uscita errato da %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -459,92 +459,92 @@ msgstr "&& e || non supportati per le stringhe\n"
 msgid "syntax error in expression\n"
 msgstr "errore di sintassi nell'espressione\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "Errore TIMECHECK: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "'(' mancante in %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "')' mancante in %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Token %s invalido: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s mancante in %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Nessuno spazio segue %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Sintassi non corretta: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Spec della modalità errata: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Spec dirmode errata: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Lunghezza locale inusuale: \"%.*s\" in %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Locale doppione %.*s in %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limite di processazione per %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Un solo argomento per %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Due file su di una riga: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Il file deve iniziare con \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Impossibile unire %%doc speciali con altri formati: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "File elencato due volte: %s\n"
@@ -574,7 +574,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: lettura importazione fallita.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: non è una chiave pubblica con formato 'armored'.\n"
@@ -594,7 +594,7 @@ msgstr "Il file deve essere preceduto da \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob non permesso: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "File non trovato da glob: %s\n"
@@ -604,7 +604,7 @@ msgstr "File non trovato da glob: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Impossibile aprire il file %%files %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "riga: %s\n"
@@ -614,7 +614,7 @@ msgstr "riga: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "File errato: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Proprietario/gruppo errato: %s\n"
@@ -638,181 +638,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Processazione file in corso: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: troppi uid\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: troppi uid\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: troppi uid\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: troppi gid\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: troppi gid\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: troppi gid\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Impossibile regolarizzare l'hostname: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "creazione archivio fallita sul file %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "creazione archivio fallita: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "scrittura cpio_copy fallita: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "lettura cpio_copy fallita: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Impossibile aprire file PreIn: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Impossibile aprire file PreUn: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Impossibile aprire file PostIn: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Impossibile aprire file PostUn: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Impossibile aprire file VerifyScript: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Impossibile aprire file script Trigger: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: apri %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: leggi %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek fallito: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s non è un pacchetto RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: lettura intestazione da %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Impossibile creare una regione dell'intestazione immutabile.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "Impossibile salvare intestazione di temp\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Dati CSA errati\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Impossibile salvare intestazione finale\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generazione firma in corso: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Impossibile ricaricare intestazione firma.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Impossibile scrivere il pacchetto: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Impossibile aprire sigtarget %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Impossibile leggere intestazione da %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Impossibile salvare intestazione su %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Impossibile leggere payload da %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Impossibile salvare payload su %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Scritto: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Impossibile generare nome del file di output per il pacchetto %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
@@ -822,32 +813,32 @@ msgstr "impossibile creare %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "riga %d: secondo %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "le voci %%changelog devono iniziare con *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "voce %%changelog incompleta\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "data errata in %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog non è in ordine cronologico decrescente\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "nome mancante in %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "nessuna descrizione in %%changelog\n"
@@ -857,17 +848,17 @@ msgstr "nessuna descrizione in %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "riga %d: Errore durante l'analisi di %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "riga  %d: Opzione errata %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "riga %d: Troppi nomi: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "riga %d: Pacchetto non esistente: %s\n"
@@ -877,210 +868,210 @@ msgstr "riga %d: Pacchetto non esistente: %s\n"
 msgid "line %d: Second description\n"
 msgstr "riga %d: Seconda descrizione\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "riga %d: Errore nell'analisi dei %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "riga %d: Secondo elenco di %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "L'architettura è esclusa: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "L'architettura non è inclusa: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS è escluso: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS non è incluso: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "il campo %s deve essere presente nel pacchetto: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Voci %s duplicate nel pacchetto: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Impossibile aprire l'icona %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Impossibile leggere l'icona %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo di icona sconosciuto: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "riga %d: L'etichetta necessita solo di un token: %s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "riga %d: Etichetta malformata: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "riga %d: Etichetta vuota: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "riga %d: Carattere '-' illegale in %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot non può essere \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "riga %d: Docdir deve iniziare con '/': %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "riga %d: Campo Epoca/Seriale deve essere un numero: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "riga %d: %s errati: qualificatori: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "riga %d: Formato BuildArchitecture errato: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Errore interno: Etichetta Bogus %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Specifiche errate del pacchetto: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Il pacchetto è già esistente: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "riga %d: Etichetta sconosciuta: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Il file spec non può utilizzare BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Origine errata: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Nessun patch number %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Nessun numero sorgente %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Impossibile scaricare nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Errore nell'analisi del %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "riga %d: Arg errato su %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "riga %d: Opzione di %%setup errata %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "riga %d: Arg necessario per %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "riga %d: Arg necessario per %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "riga %d: Arg errato per %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "riga %d: Arg necessario per %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "riga %d: Arg errato per %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Troppi patch!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "riga %d: Arg errato per %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "riga %d: secondo %%prep\n"
@@ -1133,298 +1124,302 @@ msgstr "riga %d: Secondo %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "riga %d: Errore durante l'analisi di %%description: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "riga %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Non chiuso %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean ritorna %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "istruzione %%include malformata\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr ""
 "Non è stata trovata alcuna architettura compatibile per la compilazione\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Il pacchetto non possiede alcuna %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot è già specificato, ignora %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, 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>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<specfile>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "compila attraverso %build (%prep, e poi compila) da <specfile>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "compila attraverso %install (%prep, %build, e poi installa) da <specfile>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "verifica sezione %files da <specfile>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "compila i pacchetti binari e sorgente da <specfile>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "compila il pacchetto binario solo da <specfile>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "compila il pacchetto sorgente solo da <specfile>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, 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>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "compila attraverso %build (%prep, e poi compila) da <tarball>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "compila attraverso %install (%prep, %build, poi installa) da <tarball>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verifica la sezione %files da <tarball>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "compila i pacchetti binari e sorgenti da <tarball>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "compila il pacchetto binario solo da <tarball>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "compila il pacchetto sorgente solo da <tarball>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "compila il pacchetto binario da <source package>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<source package>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "compila attraverso %install (%prep, %build, poi installa) da <source package>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "annulla la build root"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "rimuovere l'albero di compilazione quando terminato"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "genera le intestazioni compatibili con il packaging di rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignora ExcludeArch: direttive dal file spec"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "macchina a stati del file di debug"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "non eseguire alcuna fase del processo di compilazione"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "non verificare le dipendenze di compilazione"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "genera l'intestazione del pacchetto compatibile con il packaging (legacy) rpm"
 "[23]"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "non verificare il digest del pacchetto/i"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "non verificare l'intestazione del database una volta ripristinata"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "non verificare la firma(e) del pacchetto"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "non accettare i msgtr di i18N da specfile"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "rimuovi i sorgenti quando terminato"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "rimuovi specfile quando terminato"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "salta fino alla fase specificata (solo per c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "genera la firma PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "annulla la piattaforma target"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "cerca le stringhe i18N nel catalogo specfile"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "ganara le intestazioni compatibili con il (legacy) rpm[23] packaging"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Impossibile eseguire %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Impossibile biforcare %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s fallito\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "salvataggio di tutti i dati su %s fallito\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "apertura di %s fallita: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir di %s fallito: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s rmdir di %s fallito: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Ricerca di %s in corso: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Impossibile trovare %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "riga %d: Numero errato: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "riga %d: Numero no%s errato: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "riga %d: Numero %s errato: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "impossibile interrogare %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "interrogazione di specfile %s fallita, impossibile analizzare\n"
@@ -1470,52 +1465,52 @@ msgstr "File archive non è nell'intestazione"
 msgid " failed - "
 msgstr " fallito - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "il pacchetto %s è stato già aggiunto, sostituzione con %s in corso\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "il pacchetto %s è stato già aggiunto, sostituzione con %s in corso\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(cached)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib provides)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(file db)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(db provides)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignora il rapporto del nome del pacchetto [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "rimozione di %s \"%s\" dalle relazioni tsort in corso.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== registrazione relazioni tsort\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1524,26 +1519,26 @@ msgstr ""
 "========== tsorting dei pacchetti (ordine, #predecessori, #successori, "
 "albero, profondità)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== solo successori (in ordine di presentazione)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== continuazione tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder fallito, %d elementi rimanenti\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(non è un numero)"
 
@@ -1555,16 +1550,16 @@ msgstr "(non base64)"
 msgid "(invalid type)"
 msgstr "(tipo non valido)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(non è un blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 #, fuzzy
 msgid "(invalid xml type)"
 msgstr "(tipo non valido)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "(non è una firma OpenPGP)"
@@ -1584,7 +1579,7 @@ msgstr "mntctl() non ha ritornato alcun mount point: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "impossibile visualizzare statistiche per %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossibile aprire %s: %s\n"
@@ -1599,12 +1594,12 @@ msgstr "File%5d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "file %s è su di un dispositivo sconosciuto\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== Directory non incluse in modo specifico nel pacchetto:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1660,47 +1655,42 @@ msgstr "scollegamento %s di %s fallito: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s creato come %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "aggiunta di voci %d all'indice %s.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossibile creare %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossibile scrivere su %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "errore nella compilazione del file provvisorio %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1755,193 +1745,181 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-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"
-
-#: lib/package.c:726
-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"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature fallito\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nessuna firma disponibile\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead fallito\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread fallito: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s non può essere installato\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
+#: lib/poptALL.c:171
 #, fuzzy
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "seguire symlink della linea di comando"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:173
 #, fuzzy
-msgid "FTS_LOGICAL: logical walk"
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "percorso logico"
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "non modificare le directory"
 
-#: lib/poptALL.c:176
+#: lib/poptALL.c:177
 #, fuzzy
-msgid "FTS_NOSTAT: don't get stat info"
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "non ottenere informazioni su stat"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:179
 #, fuzzy
-msgid "FTS_PHYSICAL: physical walk"
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "percorso fisico"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:181
 #, fuzzy
-msgid "FTS_SEEDOT: return dot and dot-dot"
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "ritorna punto e punto-punto"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:183
 #, fuzzy
-msgid "FTS_XDEV: don't cross devices"
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "non incrociare i dispositivi"
 
-#: lib/poptALL.c:184
+#: lib/poptALL.c:185
 #, fuzzy
-msgid "FTS_WHITEOUT: return whiteout information"
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "ritorna senza alcuna informazione"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "predefinisci MACRO con un valore EXPR"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "definisci MACRO con un valore EXPR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "stapare espansione macro di EXPR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "leggi <FILE:...> invece del file predefinito"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "disabilita l'uso di libio(3) API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "invia stdout a CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "usa ROOT come directory top level"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "visualizza etichette di interrogazione conosciute"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "visualizza la configurazione finale di rpmrc e macro"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "fornisci un output meno dettagliato"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "fornisci un output più dettagliato"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "visualizza la versione di rpm utilizzato"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "macchina a stati del file payload di debug"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "macchina a stati del file payload di debug"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "processazione argomento/opzione di debug"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "macchina a stati del file di debug"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "macchina a stati del file payload di debug"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "I/O rpmio di debug"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "gestione cache URL di debug"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabella opzioni configurata in modo errato (%d)\n"
@@ -2377,7 +2355,7 @@ msgstr "non verificare i file nel pacchetto"
 msgid "don't verify files in package"
 msgstr "non verificare i file nel pacchetto"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "non verificare le dipendenze del pacchetto"
 
@@ -2418,98 +2396,98 @@ msgstr "firma pacchetto (identico a --addsign)"
 msgid "generate signature"
 msgstr "genera firma"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "pacchetto sorgente atteso, trovato binario\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "pacchetto sorgente non contiene alcun file .spec\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: esecuzione scriptlet %s in corso\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: scriptlet %s fallito (%d), omissione %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s: scriptlet %s fallito (%d), omissione %s\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "esecuzione scriptlet %s da %s-%s-%s fallita, exit status %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s presenta i file %d, test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: scriptlet %s fallito (%d), omissione %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "Impossibile ricaricare l'intestazione della firma\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "estrazione archivio fallita%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " sul file "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s fallito sul file %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s fallito: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "formato incorretto: %s\n"
@@ -2611,126 +2589,107 @@ msgstr "numero record del pacchetto: %u\n"
 msgid "record %u could not be read\n"
 msgstr "impossibile leggere il record %u\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "il pacchetto %s non è stato installato\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(file aggiunti)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(provisioning aggiunto)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: apertura fallita: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile fallito\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite fallito: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek fallito: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: non è un pacchetto rpm\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Impossibile firmare il packaging v1\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Impossibile rifirmare il packaging v2\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 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"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead fallito: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature fallito: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: lettura importazione fallita.\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: importazione fallita.\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead fallito\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry fallito\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Nessuna firma disponibile (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NON OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (CHIAVI MANCANTI:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHIAVI NON FIDATE:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NO "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "SI"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2740,71 +2699,67 @@ msgstr ""
 "\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "il pacchetto %s presenta un %s non soddisfatto/i: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s omesso/a a causa della mancanza del flag ok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== riposizionamenti\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "esclude %5d in  %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d riposiziona %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "esclusione %s %s in corso\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "riposizionamento di %s su %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "riposizionamento directory %s su %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "apertura di %s fallita: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "etichetta sconosciuta"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Dipendenze fallite:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    Risoluzioni consigliate:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Preparazione in corso..."
@@ -2829,105 +2784,120 @@ msgstr "Aggiornamento in corso..."
 msgid "Upgrading packages..."
 msgstr "Aggiornamento pacchetti in corso..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Ricerca di %s in corso: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Ripristino di %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... come %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "omissione %s - trasferimento fallito - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s non può essere installato\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<source package>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "il pacchetto %s non è riposizionabile\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installazione pacchetti binari in corso\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "errore di lettura dal file %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "il file %s necessita di una nuova versione di RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: non è un pacchetto rpm (o un manifesto del pacchetto): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "trovati sorgente %d e pacchetti binari %d\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "installazione pacchetti binari in corso\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "impossibile aprire il file %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" specifica pacchetti multipli\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossibile aprire %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "installazione di %s in corso\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Rollback dei pacchetti (+%d/-%d) fino a %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Ripristino di %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: non è un pacchetto rpm\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Nessuna firma disponibile\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "lettura fallita: %s (%d)\n"
@@ -2983,605 +2953,609 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- non supportato per le stringhe\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "impossibile connettere %s su %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "impossibile connettere %s su %s/%s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "diverso"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "il pacchetto %s è stato ideato per una architettura %s"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "il pacchetto %s è stato ideato per un sistema operativo %s"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "il pacchetto %s è già installato"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "il percorso %s nel pacchetto %s non è riposizionabile"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, 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"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, 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"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, 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"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "l'installazione del pacchetto %s necessita %ld%cB sul filesystem %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "l'installazione del pacchetto %s necessita degli inode %ld sul filesystem %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s%s necessita di %s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(installato) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s entra in conflitto con %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 "si è verificato un errore sconosciuto %d durante la manipolazione del "
 "pacchetto %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "secondi ':' mancanti su %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "nome architettura mancante su %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Riga dati incompleta su %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Troppi argomenti sulla riga dati di %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Numero arch/OS errato: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Riga di default incompleta su %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Troppi argomenti nella riga di default su %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Lettura di %s fallita: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "':' mancanti (trovato 0x%02x) su %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "argomento mancante per %s su %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "espansione %s su %s fallita:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "impossibile aprire %s su %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "architettura mancante per %s su %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "opzione errata '%s' su %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Sistema sconosciuto: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr "Si prega di contattare %s\n"
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Impossibile espandere %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Impossibile leggere %s, HOME è troppo grande.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Impossibile aprire %s per la lettura: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossibile aprire il database dei pacchetti in %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "numero invalido del pacchetto: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "'(' mancante in %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "numero invalido del pacchetto: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "impossibile aprire il database di Solve in %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "riga: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Ripristino di %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    Risoluzioni consigliate:\n"
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "acquisizione elenco dei filesystem montati in corso\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "riposizionamento di %s su %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Dimensione prevista: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Dimensione attuale: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Firma: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Impossibile eseguire %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp fallito\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp non è riuscito a salvare la firma\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dimensione firma PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "impossibile leggere la firma\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "In possesso di %d bytes della firma PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "exec fallito\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "pgp non è riuscito a salvare la firma\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dimensione firma GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "In possesso di %d bytes della firma GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Specifica %%_signature invalida nel file macro\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "È necessario impostare \"%%_gpg_name\" nel vostro file macro\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "È necessario impostare \"%%_pgp_name\" nel vostro file macro\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "Dimensione Header+Payload: "
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "MD5 digest: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "Digest SHA1 Header: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Header "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "Nessuna firma\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "Firma DSA V3: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verifica firma: PARAMETRI ERRATI\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "MD5 digest discontinuo: NON SUPPORTATO\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Firma: SCONOSCIUTA (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "esclusione directory %s in corso\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "pacchetto sorgente atteso, trovato binario\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "nessun pacchetto corrisponde a %s: %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "errore durante la lettura dell'intestazione dal pacchetto\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, fuzzy, c-format
 msgid "sanity checking %d elements\n"
 msgstr "controllo correttezza degli elementi %d\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "elaborazione impronte file %d\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "elaborazione disposizioni file\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "%c %s  mancanti"
@@ -3591,60 +3565,60 @@ msgstr "%c %s  mancanti"
 msgid "Unknown system error"
 msgstr "Sistema sconosciuto: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "errore(%d) db%d da %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "errore(%d) db%d: %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "ambiente db %s/%s   chiuso\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "ambiente db %s/%s  rimosso\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "apertura ambiente db %s/%s %s in corso\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "chiuso   indice db       %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "indice db verificato       %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "apertura indice db in corso       %s/%s %s modalità=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "impossibile connettere %s su %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "esclusivo"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "condiviso"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "bloccato   indice db       %s/%s\n"
@@ -3669,76 +3643,76 @@ msgstr "%s presenta un valore lungo troppo grande o troppo piccolo, omesso\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s presenta un valore intero troppo grande o troppo piccolo, omesso\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "{ mancante dopo %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "} mancante dopo %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "formato etichetta vuoto"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "nome etichetta vuoto"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "etichetta sconosciuta"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] previsto alla fine dell'array"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "] inaspettata"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "} inaspettata"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? previsto come espressione"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ previsto dopo ? come espressione"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} previsto come espressione"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ": previsti dopo l'espressione secondaria ?"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ previsti dopo : come espressione"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| previsto alla fine dell'espressione"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3761,390 +3735,376 @@ msgstr ""
 msgid "verify database files"
 msgstr "verifica file del database"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "ganara le intestazioni compatibili con il (legacy) rpm[23] packaging"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nome etichetta non riconosciuto: \"%s\" ignorato\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, 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"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "impossibile aprire l'indice %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "non è stato impostato alcun dbpath\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, 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"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 #, fuzzy
 msgid "miFreeHeader: skipping"
 msgstr "rpmdb: omissione in corso"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "errore(%d) nella memorizzazione del record #%d nel %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 #, fuzzy
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdb: omissione in corso"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: ripresa intestazione #%u danneggiata -- omissione in corso.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: impossibile leggere intestazione su 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 "errore(%d) nell'impostazione del record #%d dell'intestazione per la "
 "rimozione di %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "rimozione \"%s\" dall'indice %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "rimozione voci %d dall'indice %s.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "errore(%d) nell'impostazione dei record \"%s\" dall'indice %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "errore(%d) nella memorizzazione del record \"%s\" nel %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "errore(%d) nella rimozione del record \"%s\" da %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "errore(%d) nell'allocazione di una nuova istanza del pacchetto\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: omissione in corso"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "aggiunta di \"%s\" all'indice %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "aggiunta di voci %d all'indice %s.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "errore(%d) nella memorizzazione del record %s nel %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "rimozione di %s in corso dopo aver ricompilato db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "non è stato impostato alcun dbpath"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ricompilazione di %s del database in %s in corso\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "%s del database provvisorio è già esistente\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "creazione directory %s in corso\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "creazione directory %s in corso: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "apertura vecchio database con dbapi %d in corso\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "apertura nuovo database con dbapi %d in corso\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 "#%u dell'intestazione nel database è incorretto -- omissione in corso.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "impossibile aggiungere il record ariginariamente su %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ricompilazione database fallita: sarà implementato il database originale\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "sostituzione del vecchio database con il nuovo database fallita!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, 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"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "rimozione %s della directory in corso\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "rimozione %s della directory fallita: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "chiuso   indice db       %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "apertura indice db in corso       %s/%s %s modalità=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d attivo %d vuoto\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vuoto)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vuoto)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Target buffer overflow\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Macro %%%s presenta un corpo incompleto\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Macro %%%s presenta un nome illegale (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Macro %%%s presenta delle opzioni incomplete\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Macro %%%s presenta un corpo vuoto\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Macro %%%s non è in grado di espandersi\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Macro %%%s presenta un nome illegale (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Macro %%%s (%s) non è stato utilizzato sotto il livello %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opzione %c sconosciuta in %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Profondità(%d) di ricorsione maggiore del valore massimo(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c non terminato: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un/a %% è seguito/a da una macro non analizzabile\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Macro %%%.*s non trovata, omissione in corso\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "File %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "File %s è più piccolo di %u byte\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "numero invalido del pacchetto: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "numero invalido del pacchetto: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite fallito: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "numero invalido del pacchetto: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s fallito: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Successo"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Risposta incorretta del server"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Errore I/O del server"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Timeout del server"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Impossibile ricercare l'indirizzo host del server"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Impossibile ricercare il nome host del server"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Tentativo di connessione al server fallito"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Tentativo fallito di stabilire un collegamento dati col server"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Errore I/O sul file locale"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Errore nell'impostazione del server remoto in modalità passiva"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "File non trovato sul server"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Interruzione in corso"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Errore sconosciuto o inaspettato"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "lettura fallita: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(nessun errore)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "errore fatale:"
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "errore: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "avvertimento: "
 
@@ -4153,44 +4113,79 @@ msgstr "avvertimento: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "allocazione memoria (%u byte) ritornata NULLA.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "la porta url deve essere un numero\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "tentativo creazione %s fallito: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "non verificare firma header+payload"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 "non aggiornare il database della cache, visualizzare solo i percorsi del "
 "pacchetto"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Opzioni della firma:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: %%{_cache_dbpath} macro non è configurata correttamente.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: operazione cache fallita: ec %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lettura manifesto fallita: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: leggi %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Impossibile salvare intestazione finale\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "errore nella compilazione del file provvisorio %s\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"
+
+#~ 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"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Impossibile rifirmare il packaging v2\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Nessuna firma disponibile (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "File %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "File %s è più piccolo di %u byte\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Dipendenze non soddisfatte per %s: "
diff --git a/po/ja.po b/po/ja.po
index c6ebbb29d..6c7a397ec 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm-4.4\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2005-04-04 22:30+1000\n"
 "Last-Translator: SEKINE Tatsuo <tsekine@sdri.co.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -22,51 +22,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "�ӥ�ɰ�¸���μ���:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "spec �ե����� %s �򥪡��ץ�Ǥ��ޤ���: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "tar �ѥ��פΥ����ץ�˼��Ԥ��ޤ���: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "%s ���� spec �ե�������ɤ߹��ߤ˼��Ԥ��ޤ�����\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "%s �� %s ��̾�����ѹ��Ǥ��ޤ���Ǥ���: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "stat %s �˼��Ԥ��ޤ���: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s ���̾�ե�����ǤϤ���ޤ���\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "�ե����� %s �� spec �ե�����ǤϤʤ��褦�Ǥ���\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "�ӥ���оݥץ�åȥե�����: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "�������å� %s �Ѥ˥ӥ����\n"
@@ -86,166 +86,166 @@ msgstr "�ѥå������Υإå��ɤ߹�����˥��顼\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "�ڥ������ɤ�ƥ����ץ�Ǥ��ޤ���: %s\n"
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "�䤤��碌���ץ���� (-q �ޤ��� --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "���ڥ��ץ���� (-V �ޤ��� --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr "���������ץ���� (--query �ޤ��� --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr "�ե�����ĥ꡼õ�����ץ���� (--ftswalk):"
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "��̾���ץ����:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "�ǡ����١������ץ����:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "[ <specfile> | <tarball> | <source package> ] �ȤΥӥ�ɥ��ץ����:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "���󥹥ȡ���/���åץ��졼��/���󥤥󥹥ȡ��륪�ץ����:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "���⡼�ɡ����ޥ�ɤǶ��̤Υ��ץ����:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ������� %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "���Υץ������� GNU GPL �β��Ǽ�ͳ�����ۤǤ��ޤ���\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "�������� (%d) �Ǥ��������顼 :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "��ĤΥ᥸�㡼�⡼�ɤΤߤ���ꤷ�Ʋ�����"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "�䤤��碌/���ڤϰ��٤˰�Ĥ����¹ԤǤ��ޤ���"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "ͽ�������䤤��碌�Υե饰"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "ͽ�������䤤��碌�Υե����ޥå�"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "ͽ�������䤤��碌�Υ�����"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "���󥹥ȡ��롢���åץ��졼�ɡ���������������ڥå��ե����������Τ߶����Ǥ�"
 "�ޤ���"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "�ե�����ϥѥå��������󥹥ȡ�����ˤΤߺ����֤Ǥ��ޤ���"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "--prefix �� --relocate �� --excludepath �Ȥ�Ʊ���ˤϻ��ѤǤ��ޤ���"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate �� --excludepath �Ͽ������ѥå������򥤥󥹥ȡ��뤹����Τ߻��Ѥ�"
 "���ޤ���"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix �Ͽ����ѥå������Υ��󥹥ȡ�����Τ߻��ѤǤ��ޤ���"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix �ΰ����� / ����Ϥޤ�ʤ���Фʤ�ޤ���"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs �� --includedocs ��Ʊ���ˤϻ���Ǥ��ޤ���"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches �ϥѥå�����������Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles �ϥѥå��������󥹥ȡ�����Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb �ϥѥå��������󥹥ȡ��롦������Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -253,7 +253,7 @@ msgstr ""
 "������ץȤ�̵���ˤ���褦�ʥ��ץ����ϡ��ѥå������Υ��󥹥ȡ��롦�������"
 "�߻���Ǥ��ޤ���"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -261,7 +261,7 @@ msgstr ""
 "�ȥꥬ����̵���ˤ���褦�ʥ��ץ����ϥѥå��������󥹥ȡ��롦������Τ߻���"
 "�Ǥ��ޤ���"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -269,13 +269,13 @@ msgstr ""
 "--nodeps �ϥѥå���������/��ӥ��/�ꥳ��ѥ���/���󥹥ȡ���/���/���ڻ��Τ�"
 "����Ǥ��ޤ���"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test �ϥѥå������Υ��󥹥ȡ���/���/�������Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -283,105 +283,105 @@ msgstr ""
 "--root (-r) �ϥ��󥹥ȡ���/���/�䤤��碌/�ǡ����١����ƹ��ۻ��Τ߻���Ǥ���"
 "��"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) �ΰ����� / ����Ϥޤ�ʤ���Фʤ�ޤ���"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "��̾����ե����뤬����ޤ���\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "�ե����� %s �˥��������Ǥ��ޤ���\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp �����դ���ޤ���: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "�ѥ��ե졼���Υ����å��˼��Ԥ��ޤ�����\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "�ѥ��ե졼��������Ǥ���\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "�ޥ����ե��������̵���� %%_signature ���ꡣ\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign �ϥѥå������������Τ߻���Ǥ��ޤ���"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "�¹Լ���\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "��ӥ�ɤ���ѥå����������ꤵ��Ƥ��ޤ���"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "�ӥ�ɤΤ���� spec �ե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "�ӥ�ɤΤ���� tar �ե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "���󥤥󥹥ȡ��뤹��ѥå����������ꤵ��Ƥ��ޤ���"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "���󥹥ȡ��뤹��ѥå����������ꤵ��Ƥ��ޤ���"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "�䤤��碌�Τ���ΰ��������ꤵ��Ƥ��ޤ���"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "���ڤΤ���ΰ��������ꤵ��Ƥ��ޤ���"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "���������ꤵ��Ƥ��ޤ���"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "����ե�����򥪡��ץ�Ǥ��ޤ���\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "�¹���(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s �μ¹Ԥ˼��� (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s �������ʽ�λ���ơ����� (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -440,92 +440,92 @@ msgstr "&& �� || ��ʸ����ˤϻȤ��ޤ���\n"
 msgid "syntax error in expression\n"
 msgstr "�����ʸˡ���顼\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK ����: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "%s �� '(' ������ޤ��� %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "%s(%s �θ�� ')' ������ޤ���\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "̵���ʥȡ����� %s: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s �� %s %s �ˤ���ޤ���\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() ��³�����򤬤���ޤ���: %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "ʸˡ���顼: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "�����ʥ⡼�ɻ���: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "�����ʥǥ��쥯�ȥ�⡼�ɻ���: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "�۾�ʥ�������Ĺ: \"%.*s (%%lang(%s))\"\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "�������� %.*s �ν�ʣ�� %%lang(%s) �ˤ���ޤ���\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "%%docdir �θ³���ã���ޤ�����\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "%%docdir �ΰ����� 1 �ĤΤߤǤ�\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "1 �Ԥ� 2 �ĤΥե�����: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "�ե������ \"/\" ����Ϥޤ�ʤ���Фʤ�ޤ���: %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "¾�Υե���������̤� %%doc �򺮤��뤳�ȤϤǤ��ޤ���: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "�ե����뤬2��ɽ������Ƥ��ޤ�: %s\n"
@@ -555,7 +555,7 @@ msgstr "%s: �����ʥ��� (%d) ���ɤ߹���ޤ���Ǥ�����\n"
 msgid "%s: public key read failed.\n"
 msgstr "%s: ���������ɤ߹��ߤ˼��Ԥ��ޤ�����\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: ASCII�����θ������ǤϤ���ޤ���\n"
@@ -575,7 +575,7 @@ msgstr "�ե��������Ƭ�� \"/\" ��ɬ�פǤ�: %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob �ϵ��Ĥ���Ƥ��ޤ���: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "�ե����뤬���Ĥ���ޤ��� (by glob): %s\n"
@@ -585,7 +585,7 @@ msgstr "�ե����뤬���Ĥ���ޤ��� (by glob): %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files �Υե����� %s �򥪡��ץ�Ǥ��ޤ���: %s\\n\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "%s����: \n"
@@ -595,7 +595,7 @@ msgstr "%s����: \n"
 msgid "Bad file: %s: %s\n"
 msgstr "�����ʥե�����: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�����ʽ�ͭ��/���롼��: %s\n"
@@ -619,181 +619,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "�ե�����ν�����: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: uid ��¿�����ޤ���\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: uid ��¿�����ޤ���\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: uid ��¿�����ޤ���\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: gid ��¿�����ޤ���\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: gid ��¿�����ޤ���\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: gid ��¿�����ޤ���\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "�ۥ���̾�������ʤ�ΤˤǤ��ޤ���: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "�ե����� %s �ǥ��������ֺ����˼���: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "���������ֺ����˼���: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy �ǽ񤭹��ߤ˼���: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy ���ɤ߹��ߤ˼���: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "TriggerScript �ե�����򥪡��ץ�Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s �Υ����ץ�: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: %s ���ɤ߹���: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek �˼��Ԥ��ޤ���: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s �� RPM �ѥå������ǤϤ���ޤ���\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ����إå����ɤ߹�����\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "���ѥإå��ΰ������Ǥ��ޤ���\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "����إå��ν񤭹��ߤ��Ǥ��ޤ���\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "������ CSA �ǡ���\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "�إå��ν�ü�ν񤭹��ߤ��Ǥ��ޤ���\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "��̾�κ�����: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "��̾�إå��κ��ɤ߹��ߤ��Ǥ��ޤ���\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "�ѥå������ν񤭹��ߤ˼���: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget %s �Υ����ץ�˼���: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s ����إå��ɤ߹��ߤ˼���: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s �ؤΥإå��񤭹��ߤ˼���: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s ���� Payload �ɤ߹��ߤ˼���: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s �ؤ� Payload �񤭹��ߤ˼���: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "�񤭹��ߴ�λ: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "�ѥå����� %s �ν��ϥե�����̾�������Ǥ��ޤ���Ǥ���: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ������Ǥ��ޤ���: %s\n"
@@ -803,32 +794,32 @@ msgstr "%s ������Ǥ��ޤ���: %s\n"
 msgid "line %d: second %s\n"
 msgstr "%d ����: 2���ܤ� %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "%%changelog ����ȥ�� * �ǻϤޤ�ʤ���Фʤ�ޤ���\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "�Դ����� %%changelog ����ȥ�\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "%%changelog �������������: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog �����դο���������¤�Ǥ��ޤ���\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "%%changelog ���̾��������ޤ���\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "%%changelog �������������ޤ���\n"
@@ -838,17 +829,17 @@ msgstr "%%changelog �������������ޤ���\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d ����: %%description �β��ϥ��顼: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d ����: �����ʥ��ץ���� %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "%d ����: ̾����¿�����ޤ�: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "%d ����: �ѥå�������¸�ߤ��ޤ���: %s\n"
@@ -858,210 +849,210 @@ msgstr "%d ����: �ѥå�������¸�ߤ��ޤ���: %s\n"
 msgid "line %d: Second description\n"
 msgstr "%d ����: 2���ܤ�����\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "%d ����: %%files �β��ϥ��顼: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "%d ����: 2���ܤ� %%files �ꥹ��\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "�������ƥ�����Ͻ�������Ƥ��ޤ�: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "�������ƥ�����ϴޤޤ�Ƥ��ޤ���: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS �Ͻ�������Ƥ��ޤ�: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS �ϴޤޤ�Ƥ��ޤ���: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "%s �ե�����ɤ��ѥå��������ɬ�פǤ�: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "�ѥå�������� %s ����ȥ꤬��ʣ���Ƥ��ޤ�: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "�������� %s �򥪡��ץ�Ǥ��ޤ���: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "�������� %s ���ɤळ�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "�����ʥ������󥿥���: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "%d ����: �����ϥȡ������ 1�Ĥ����Ȥ�ޤ���: %s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "%d ����: �Դ����ʷ��Υ���: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "%d ����: ������: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "%d ����: %s ���������ʸ�� '-' : %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot �� \"/\" �ˤ��뤳�ȤϤǤ��ޤ���: %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "%d ����: Prefix �� \"/\" �ǽ���äƤϤ����ޤ���: %s\n"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "%d ����: Docdir �� '/' �ǻϤޤ�ʤ���Фʤ�ޤ���: %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "%d ����: Epoch/Serial �ե�����ɤϿ����Ǥʤ���Фʤ�ޤ���: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "%d ����: �����ʽ����� %s : %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "%d ����: ������ BuildArchtecture �ե����ޥå�: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "�������顼: �ˤ��Υ��� %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr "����ι�ʸ�ϥ��ݡ��Ȥ���ޤ���: %s\n"
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "�����ʥѥå������λ���: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "�ѥå������ϴ���¸�ߤ��Ƥ��ޤ�: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "%d ����: �����ʥ���: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "spec �ե������ BuildRoot ����ѤǤ��ޤ���\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "�����ʥ�����: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "�ѥå��ֹ� %d �Ϥ���ޤ���\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "�������ֹ� %d �Ϥ���ޤ���\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "nosource %s �����������ɤǤ��ޤ���: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "%%setup �ι�ʸ���ϥ��顼: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "%d ����: %%setup �ؤ������ʰ���: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "%d ����: ������ %%setup ���ץ���� %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "%d ����: %%patch -b �ˤϰ�����ɬ�פǤ�: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "%d ����: %%patch -z �ˤϰ�����ɬ�פǤ�: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "%d ����: %%patch -p �ؤ������ʰ���: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "%d ����: %%patch -p �ˤϰ�����ɬ�פǤ�: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "%d ����: %%patch -p �ؤ������ʰ���: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "�ѥå���¿�����ޤ�!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "%d ����: %%patch �ؤ������ʰ���: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "%d ����: 2���ܤ� %%prep\n"
@@ -1113,289 +1104,293 @@ msgstr "%d ����: 2���ܤ� %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "%d ����: ̤���ݡ��Ȥ�����������ץ�: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "%d ����: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s �򥪡��ץ�Ǥ��ޤ���: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if ���Ĥ��Ƥ��ޤ���\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean �� %d ���֤��ޤ�����\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%if ���ʤ��Τ� %%else ������ޤ�\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%if ���ʤ��Τ� %%endif ������ޤ�\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "�������� %%include �ԤǤ�\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "����(build)��ǽ�ʸߴ��������ƥ�����Ϥ���ޤ���\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "�ѥå������ˤ� %%description ������ޤ���: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "BuildRoot �ϴ��˻��ꤵ��Ƥ��ޤ���%s ��̵�뤷�ޤ�\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "<specfile> �� %prep (������Ÿ���� patch ��Ŭ��) �ޤǼ¹�"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<specfile>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "<specfile> �� %build (%prep �ȥ���ѥ���) �ޤǼ¹�"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "<specfile> �� %install (%prep, %build, ���󥹥ȡ���) �ޤǼ¹�"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "<specfile> �� %files ���������򸡾�"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "<specfile> �򸵤ˡ��Х��ʥ�/�������ѥå���������"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "<specfile> �򸵤ˡ��Х��ʥ�ѥå������Τߺ���"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "<specfile> �򸵤ˡ��������ѥå������Τߺ���"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "<tarball> ���� %prep (������Ÿ���ȥѥå�Ŭ��) �ޤǼ¹�"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "<tarball> ���� %build (%prep �ȥ���ѥ���) �ޤǼ¹�"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "<tarball> ���� %install (%prep, %build, ���󥹥ȡ���) �ޤǼ¹�"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "<tarball> ���� %files ���������򸡾�"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "<tarball> �򸵤ˡ��Х��ʥ�/�������ѥå����������"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "<tarball> �򸵤ˡ��Х��ʥ�ѥå������Τߤ����"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "<tarball> �򸵤ˡ��������ѥå������Τߤ����"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "<source package> �򸵤˥Х��ʥ�ѥå����������"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<source package>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr "<source package> ���� %install (%prep, %build, ���󥹥ȡ���) �ޤǼ¹�"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "build root ��������"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "�ѥå�����������ĥ꡼����"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "rpm4 �ѥå������󥰸ߴ��Υإå�������"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "spec �ե������ ExcludeArch: ��̵��"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "�ե�������֥ޥ�����ΥǥХå�"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "�ӥ�ɤΤɤ��ʳ���¹Ԥ��ʤ�"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "�ӥ�ɰ�¸���򸡾ڤ��ʤ�"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "(�Ť�) rpm[23] �ѥå������󥰸ߴ��Υإå�������"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "�ѥå����������������Ȥθ��ڤ򤷤ޤ���"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "���������ǡ����١����إå��򸡾ڤ��ޤ���"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "�ѥå�������̾�θ��ڤ򤷤ޤ���"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "specfile ���� i18N msgstr ������դ��ʤ�"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "��λ�好�����������ޤ���"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "��λ���� spec �ե��������"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "���ꤷ�������ޤǥ����åפ��ޤ� (c, i �ǤΤ�ͭ��)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "PGP/GPG ��̾���������ޤ���"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "�������åȥץ�åȥե������������"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "specfile ������������ i18N ʸ����򸡺�����"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "(�Ť�) rpm[23] �ѥå������󥰸ߴ��Υإå����������ޤ���"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s ��¹ԤǤ��ޤ���Ǥ���: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, fuzzy, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr "%s: waitpid(%d) rc %d ���� %x �� %u.%03u\n"
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s: ����: %s\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "%s �ؤ� Payload �񤭹��ߤ˼���: %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s %s �� rmdir �˼���: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s %s �� rmdir �˼���: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "�ե����� %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s ���ɤ߹��ߤ˼���: %s��\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "%d ����: �������ֹ�: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "%d ����: ������ no%s �ֹ�: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "%d ����: ������ %s �ֹ�: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s ���䤤��碌�Ǥ��ޤ���: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "���ڥå��ե����� %s ���䤤��碌�˼��Ԥ��ޤ��������ϤǤ��ޤ���\n"
@@ -1441,52 +1436,52 @@ msgstr "���������֥ե����뤬�إå��ˤ���ޤ���"
 msgid " failed - "
 msgstr "���� - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "�ѥå����� %s �ϴ����ɲä���Ƥ��ޤ���%s �����Ф��ޤ���\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "�ѥå����� %s �ϴ����ɲä���Ƥ��ޤ��� %s ���ִ����ޤ���\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr "  Obsoletes: %s\t\t%s �������ޤ�\n"
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(����å���Ѥ�)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib ��)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(files �ǡ����١���)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(provides �ǡ����١���"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "�ѥå�����̾�δط���̵�뤷�ޤ� [%d]\t%s �� %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort �ط����� %s \"%s\" �������ޤ���\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort �ط���Ͽ���Ƥ��ޤ�\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
@@ -1494,26 +1489,26 @@ msgstr ""
 "========== �ѥå������� tsort (���֡���Կ�����³�����ĥ꡼����������) ���Ƥ�"
 "�ޤ�\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== ��³�Τ� (%d �Х���)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "�롼��:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort ��³����...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder �˼���, �Ĥ� %d ��\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(�����ǤϤ���ޤ���)"
 
@@ -1525,15 +1520,15 @@ msgstr "(base64 �ǤϤ���ޤ���)"
 msgid "(invalid type)"
 msgstr "(�����ʥ�����)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(blob �ǤϤ���ޤ���)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(������ XML ������)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(OpenPGP ��̾�ǤϤ���ޤ���)"
 
@@ -1552,7 +1547,7 @@ msgstr "mntctl() �ǥޥ���ȥݥ���Ȥμ����˼��Ԥ��ޤ���: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "stat %s �˼��Ԥ��ޤ���: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s\n"
@@ -1567,11 +1562,11 @@ msgstr "%5d 0x%04x %s %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "�ե����� %s �������ʥǥХ�����ˤ���ޤ���\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== �ǥ��쥯�ȥ�ϡ��ѥå�����������Ū�˴ޤޤ�Ƥ��ޤ���:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1628,47 +1623,42 @@ msgstr "%s %s �� unlink �˼���: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s �� %s �Ȥ��ƺ�������ޤ�����\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "�ꥹ�Ȥ�������� %d ���ɲä��ޤ���\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s �� %s �˺����Ǥ��ޤ���\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s �� %s �˽񤭹���ޤ���\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "����ե����� %s �κ����˼��Ԥ��ޤ�����\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "blob ������ (%d): �۾�Ǥ���8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "����[%d]: �۾�Ǥ���tag %d type %d offset %d count %d\n"
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr "region ���ե��å�: �۾�Ǥ���tag %d type %d offset %d count %d\n"
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr "region �إå��ʹ�: �۾�Ǥ���tag %d type %d offset %d count %d\n"
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "region ������: �۾�Ǥ���ril(%d) > il(%d)\n"
@@ -1723,183 +1713,178 @@ msgstr "�إå� blob(%d): �۾�Ǥ����ɤ߹��߷�̤� %d �Ǥ���\n"
 msgid "hdr load: BAD\n"
 msgstr "�إå�������: �۾�Ǥ���\n"
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-"���ΥС������� RPM �ǤϥС������ 1 �Υѥå������󥰤ϥ��ݡ��Ȥ��Ƥ��ޤ�"
-"��\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"���ΥС������� RPM �Ǥϥ᥸�㡼�ֹ� <=4 �Υѥå����������Τߥ��ݡ��Ȥ��Ƥ�"
-"�ޤ�\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature �˼��Ԥ��ޤ���: %s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ��̾������ޤ���\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead �˼��Ԥ��ޤ���: %s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread �˼��Ԥ��ޤ���: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s �򥤥󥹥ȡ���Ǥ��ޤ���\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+#, fuzzy
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "FTS_COMFOLLOW: ���ޥ�ɥ饤��Υ���ܥ�å���󥯤��ɤ������ޤ�"
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+#, fuzzy
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "FTS_LOGICAL: ����õ��"
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+#, fuzzy
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "FTS_NOCHDIR: �ǥ��쥯�ȥ���ѹ����ޤ���"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+#, fuzzy
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "FTS_NOSTAT: ���ơ����������������ޤ���"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+#, fuzzy
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "FTS_PHYSICAL: ʪ��õ��"
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+#, fuzzy
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "FTS_SEEDOT: �ɥå�(.)�ȥɥåȥɥå�(..)���֤��ޤ���"
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+#, fuzzy
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "FTS_XDEV: ¾�Υե����륷���ƥ��õ�����ޤ���"
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+#, fuzzy
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "FTS_WHITEOUT: �������줿������֤��ޤ���"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "�� EXPR ����ĥޥ�����ͽ��������ޤ���"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "�� EXPR ����� MACRO ��������ޤ���"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "EXPR �Υޥ�����Ÿ��������̤�ɽ�����ޤ���"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "�ǥե���ȥե����������� <FILE:...> ���ɤ߹��ߤޤ���"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "libio(3) API �λ��Ѥ�̵���ˤ��ޤ���"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "ɸ����Ϥ� CMD ���������ޤ���"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "ROOT ��ȥåץǥ��쥯�ȥ�Ȥ��ƻ��Ѥ��ޤ���"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "���䤤��碌������ɽ�����ޤ���"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "�ǽ�Ū�� rpmrc �ȥޥ����������ɽ�����ޤ���"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "�ܺ٤Ǥʤ����Ϥ��󶡤��ޤ���"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "���ܺ٤ʽ��Ϥ��󶡤��ޤ���"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "���Ѥ��Ƥ��� rpm �ΥС�������ɽ�����ޤ���"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "�ڥ������ɤΥե�������֥ޥ���ΥǥХå�"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr "�ե�������֥ޥ���˥���åɤ����Ѥ���"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "���ץ����/����������ΥǥХå�"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "�ѥå��������֥ޥ���ΥǥХå�"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr "�ѥå��������֥ޥ���˥���åɤ����Ѥ���"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "rpmio �����ϤΥǥХå�"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "URL ����å���ϥ�ɥ�󥰤ΥǥХå�"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: ���ץ����ơ��֥�����꤬����������ޤ��� (%d)\n"
@@ -2323,7 +2308,7 @@ msgstr "�ե����륻�����ƥ�����ƥ����Ȥ򸡾ڤ��ޤ���"
 msgid "don't verify files in package"
 msgstr "�ѥå�������Υե�����򸡾ڤ��ޤ���"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "�ѥå������ΰ�¸�ط��򸡾ڤ��ޤ���"
 
@@ -2363,103 +2348,103 @@ msgstr "�ѥå������˽�̾���� (--addsign ��Ʊ��Ǥ�)"
 msgid "generate signature"
 msgstr "��̾���������ޤ���"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "�������ѥå����������Ԥ���ޤ���������ϥХ��ʥ�ѥå������Ǥ�\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "�������ѥå������� .spec �ե����뤬����ޤ���\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rc %d ���� %x �� %u.%03u\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s.%s) <lua> ������ץȤ�¹Ԥ��Ƥ��ޤ���\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s.%s) ;�פ� \"%s\" �򥹥��åפ��ޤ�����\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s.%s) %s Ʊ��������ץȤ򳫻Ϥ��ޤ�����\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 "%s(%s-%s-%s.%s) ������ץȤμ¹Ԥ˼��Ԥ��ޤ�����waitpid (%d)��rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s.%s) ������ץȤμ¹Ԥ˼��Ԥ��ޤ�������λ���ơ����� %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s.%s) ������ץȤμ¹Ԥ˼��Ԥ��ޤ�������λ���ơ����� %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s ��  %d �ե������ޤߡ��ƥ��� = %d �Ǥ���\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: ������ץ� %s �μ¹Ԥ˼��Ԥ��ޤ��� (%d)��%s �򥹥��åפ��ޤ���\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "��̾�إå��κ��ɤ߹��ߤ��Ǥ��ޤ���\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "���������֤ο�Ĺ�˼���%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr ": �ե����� "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s: �ե����� %s �Ǽ���: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s: ����: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, fuzzy, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 "������줿��ΤȤ��ƥޡ��� %s ���դ��褦�Ȥ��Ƥ��ޤ�(�������ܡ��� (%p) "
 "��)��\n"
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, fuzzy, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 "������줿��ΤȤ��ƥޡ��� %s ���դ��褦�Ȥ��Ƥ��ޤ�(�������ܡ��� (%p) "
 "��)��\n"
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "�����ʥե����ޥå�: %s\n"
@@ -2560,126 +2545,107 @@ msgstr "�ѥå������쥳�����ֹ�: %u\n"
 msgid "record %u could not be read\n"
 msgstr "�쥳���� %u ���ɤ߹���ޤ���Ǥ���\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "�ѥå����� %s �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(files ���ɲúѤ�)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(provide���ɲúѤ�)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: �����ץ�˼��Ԥ��ޤ���: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile �˼��Ԥ��ޤ�����\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite �˼��Ԥ��ޤ���: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek �˼��Ԥ��ޤ���: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: rpm �ѥå������ǤϤ���ޤ���\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: v1.0 �� RPM �ѥå������ˤϽ�̾�Ǥ��ޤ���\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: v2.0 �� RPM �ѥå������ˤϺƽ�̾�Ǥ��ޤ���\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: ���� ID %s �ˤ����˽�̾����Ƥ��ޤ��������åפ��ޤ���\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead �˼��Ԥ��ޤ���: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature �˼��Ԥ��ޤ���: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: ����ݡ����ɤ߹��ߤ˼��Ԥ��ޤ���(%d)��\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: ����ݡ��Ȥ˼��Ԥ��ޤ�����\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead �˼��Ԥ��ޤ�����\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry �˼��Ԥ��ޤ�����\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: ��̾������ޤ��� (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "OK �ǤϤ���ޤ���"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr "(���Ĥ���ʤ���:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr "(����Ǥ��ʤ���:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NO "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "YES"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2688,71 +2654,67 @@ msgstr ""
 "\"B\" �ΰ�¸���� epoch ��ɬ�פȤ��ޤ� (\"A\" ��Ʊ���Ǥ���Ȳ��ꤷ��)\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "�ѥå����� %s �� %s ���������ޤ���: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s �� missingok �ե饰�Τ��᥹���åפ��ޤ�\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== ������\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d �������Ƥ��ޤ�   %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d �����֤��Ƥ��ޤ� %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s ��������Ƥ��ޤ���\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s �� %s �˺����֤��Ƥ��ޤ���\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "�ǥ��쥯�ȥ� %s �� %s �˺����֤��Ƥ��ޤ�\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "�����ʥ���: \"%s\"\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "��¸���η�ǡ:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    �������:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "������..."
@@ -2777,106 +2739,121 @@ msgstr "���åץ��졼����..."
 msgid "Upgrading packages..."
 msgstr "�ѥå������򥢥åץ��졼����..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "��ɸ���ɲ�: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s �������\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... (%s �Ȥ���)\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s �򥹥��åפ��ޤ� - ž���˼��� - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s �򥤥󥹥ȡ���Ǥ��ޤ���\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "\t�������ѥå��������ɲä��ޤ��� [%d]\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr "�ѥå����� %s �Ϻ����֤Ǥ��ޤ���\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "\t�Х��ʥ�ѥå��������ɲä��ޤ��� [%d]\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "�ե����� %s ���ɤ߹��ߥ��顼\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "�ե����� %s �ˤϤ�꿷�����С������� RPM ��ɬ�פǤ���\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: RPM �ѥå�����(�ޤ��ϥѥå������Υꥹ��)�ǤϤ���ޤ���: %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 "%d �ĤΥ������ѥå������� %d �ĤΥХ��ʥ�ѥå����������Ĥ���ޤ�����\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "�Х��ʥ�ѥå������򥤥󥹥ȡ�����\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "�ե����� %s �򥪡��ץ�Ǥ��ޤ���: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ��ʣ���Υѥå���������ꤷ�Ƥ��ޤ�\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s �򥪡��ץ�Ǥ��ޤ���: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s �򥤥󥹥ȡ�����Ǥ���\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "�ѥå����� (+%d/-%d) �� %-24.24s �إ�����Хå�(0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "�ƥѥå��������줿�ѥå�����������:\n"
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\t%s ������:\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: rpm �ѥå������ǤϤ���ޤ���\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: ��̾������ޤ���\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "�ɤ߹��ߤμ���: %s (%d)\n"
@@ -2924,605 +2901,609 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "lua ������ץȤ��������ݡ��ȡ�"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "�ȥ�󥶥�����󥻥åȤκ���"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "�ȥ�󥶥�����󥹥����ܡ��ɤ������(%p, %p)\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "�ۤʤ�"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "�ѥå����� %s �� %s �������ƥ���������Ǥ�"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "�ѥå����� %s �� %s OS �����Ǥ�"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "�ѥå����� %s �ϴ��˥��󥹥ȡ��뤵��Ƥ��ޤ���"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "�ѥ� %s (%s �ѥå�����) �Ϻ����֤Ǥ��ޤ���"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "�ե����� %s �� %s �� %s �Υ��󥹥ȡ���Ƕ��礷�Ƥ��ޤ���"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "�ե����� %s (�ѥå����� %s ����) �ϡ��ѥå����� %s ����Υե�����ȶ��礷�Ƥ�"
 "�ޤ���"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "�ѥå����� %s (%s ��꿷�������) �ϴ��˥��󥹥ȡ��뤵��Ƥ��ޤ���"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 "�ѥå����� %s �Υ��󥹥ȡ���ˤ� %ld%cB �Υ��ڡ�����ɬ�פǤ� (%s �ե����륷��"
 "�ƥ���)"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "�ѥå����� %s �Υ��󥹥ȡ���ˤ� %ld �� inode ��ɬ�פǤ� (%s �ե����륷���ƥ�"
 "���)"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s �� %s%s ��ɬ�פȤ���Ƥ��ޤ�"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(���󥹥ȡ���Ѥ�)"
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s �� %s%s �ȶ��礷�ޤ���"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "�����ʥ��顼 %d ���ѥå����� %s ������ȯ�����ޤ���"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "2���ܤ� ':' ������ޤ��� (%s:%d ��)\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s:%d �˥������ƥ�����̾������ޤ���\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s:%d �ǥǡ����Ԥ��Դ����Ǥ�\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s:%d �ǥǡ����Ԥ˰�����¿�����ޤ�\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "������ arch/os �ֹ�: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s:%d ���Դ����ʥǥե���ȹ�\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s:%d �ǥǥե���ȹԤ˰�����¿�����ޤ�\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s ���ɤ߹��ߤ˼���: %s��\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "':' ������ޤ��� (0x%02x �����Ĥ��ä�) (%s:%d)\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s �ΰ���������ޤ��� (%s:%d)\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s ��Ÿ���˼��Ԥ��ޤ��� (%s:%d) \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%s �򥪡��ץ�Ǥ��ޤ��� (%s:%d): %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s �ѤΥ������ƥ����㤬���Ĥ���ޤ��� (%s:%d)\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "�����ʥ��ץ����Ǥ�: '%s' (%s:%d)\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "�����ʥ����ƥ�: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "%s ��Ÿ���Ǥ��ޤ���\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "%s ���ɤ߹���ޤ���HOME ���礭�����ޤ���\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s ���ɤ߹����Ѥ˥����ץ�Ǥ��ޤ���: %s��\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s �ˤ��� Package �ǡ����١����򥪡��ץ�Ǥ��ޤ���\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "�ѥå�������٥����;ʬ�ʡ�(�פ�����ޤ�: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "�ѥå�������٥���ˡ�(�פ�����ޤ���: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "�ѥå�������٥���ˡ�)�פ�����ޤ���: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "%s �ˤ��� Solve �ǡ����١����򥪡��ץ�Ǥ��ޤ���\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "�ɲ���: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "�����: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    �������:\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "�ޥ���ȺѤߥե����륷���ƥ�:\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr "    i        dev    bsize       bavail       iavail mount point\n"
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%08x %8u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr "�ȥ�󥶥�����󥹥����ܡ��ɤ������(%p, %p)\n"
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr "\t�������ܡ��ɤΥ��ɥ쥹:  %p\n"
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\t%d ����ȥ�ʬ���ΰ���������\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr "\t%s �Υ���ȥ�򥹥����ܡ��ɤ��ɲ���Ǥ���\n"
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr "\t\t����ȥ�Υ��ɥ쥹:  %p\n"
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr "\t�������ܡ��ɤ� %s �Υ���ȥ�򹹿���Ǥ���\n"
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr "�������ܡ��� (%p) ������褦�Ȥ��Ƥ��ޤ���\n"
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr "\t���ȥ������ 0 ... �������ޤ���\n"
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr "�������ܡ��� (%p) ����� %s �򻲾Ȥ��Ƥ��ޤ���\n"
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr "\t���ɥ쥹 %p �ǥ���ȥ�򸫤Ĥ��ޤ�����\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "���Ԥ���륵����: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "    �ºݤΥ�����: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "��̾������ (%d): ������read �� %d ���֤��ޤ���\n"
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr "��̾���ܰ�: ����\n"
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr "��̾����: �����������ο� (%d) ���ϰϳ��Ǥ���\n"
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr "��̾�ǡ���: �������Х��ȿ� (%d) ���ϰϳ��Ǥ���\n"
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr "��̾ blob(%d): ������read �� %d ���֤��ޤ�����\n"
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "��̾����[%d]: ���������� %d ������ %d ���ե��å� %d ������� %d\n"
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr "��̾���ɤ߹���: ������\n"
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr "��̾�� pad ������(%d): ������%d �Х����ɤ߹��ߤޤ�����\n"
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr "��̾�Υ�����(%d): ������fstat(2) �˼��Ԥ��ޤ�����\n"
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "��̾: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s ��¹ԤǤ��ޤ���Ǥ���: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp ����\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp ����̾��񤭹���Τ˼��Ԥ��ޤ�����\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ��̾������: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "��̾���ɤ߹���ޤ���Ǥ�����\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "PGP ��̾�� %d �Х��Ȥ����\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "�¹Լ���\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "gpg ����̾��񤭹���Τ˼��Ԥ��ޤ�����\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ��̾������: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG ��̾�� %d �Х��Ȥ����\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "�ޥ����ե�������������� %%_signature\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "�ޥ����ե�������� \"%%_gpg_name\" �����ꤷ�ʤ���Фʤ�ޤ���\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "�ޥ����ե�������� \"%%_pgp_name\" �����ꤷ�ʤ���Фʤ�ޤ���\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "�إå��ȥڥ������ɥ�����:"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "MD5 ������������: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "�إå� SHA1 ������������: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "�إå� "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "V4 DSA ��̾: "
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "V3 DSA ��̾: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "��̾��ǧ: �۾�ʥѥ�᡼���Ǥ���\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "MD5 �����������Ȥ���»: ���ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "��̾: ̤��(%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "�ǥ��쥯�ȥ�ν���: %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr "�ȥ�󥶥������˼��Ԥ��ޤ���...������Хå���\n"
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr "��ư������Хå��ȥ�󥶥����������դ��Ǥ��ޤ���Ǥ���!\n"
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr "�ȥ�󥶥����������Ǥ���ƥѥå��������줿�إå���������Ƥ��ޤ���\n"
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\t%s �򸡺���...\n"
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr "\t���פ򸫤Ĥ��ޤ�����\n"
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr "\t���פ����Ĥ���ޤ���\n"
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr "\t�ƥѥå��������줿�ѥå����������Ĥ���ޤ���!\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr "\tREMOVETID �� INSTALLTID �˰��פ��ޤ�����\n"
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\t̾��:  %s.\n"
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\t�ƥѥå��������줿�ѥå������� %s �Ǥ�...\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 #, fuzzy
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr "��ư������Хå��ȥ�󥶥������� %s ���ɲä��ޤ�����\n"
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr "���󥹥ȡ������ǥǡ����١����Υ��󥹥��󥹤�����Ǥ��ޤ���Ǥ���!\n"
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr "��ư������Хå��ȥ�󥶥������Υإå�������Ǥ��ޤ���Ǥ�����\n"
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\t�ƥѥå��������줿�ѥå������إå����ɲä��ޤ���: %s.\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr "\t���󥹥ȡ������� %s �����ɲä��ޤ�����\n"
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr "\t������Ǥ��ɲä��ޤ�����\n"
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 "��ư������Хå��ȥ�󥶥������κƥѥå������إå�������Ǥ��ޤ���Ǥ���!\n"
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 #, fuzzy
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr "��ư������Хå��ȥ�󥶥������˺�����Ǥ��ɲäǤ��ޤ���\n"
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 #, fuzzy
 msgid "\tFound existing upgrade element.\n"
 msgstr "\t������Ǥ��ɲä��ޤ�����\n"
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, fuzzy, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr "\t������Ǥ��ɲä��ޤ�����\n"
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\t�ƥѥå��������줿�ѥå����� %s ���ɲä��ޤ�����\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, fuzzy, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\t������Ǥ��ɲä��ޤ�����\n"
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr "��ư������Хå��ȥ�󥶥������˺�����Ǥ��ɲäǤ��ޤ���\n"
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr "\t�ƥѥå��������줿�ѥå�����������ޤ���...���⤷�ޤ���\n"
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr "�ƥѥå��������줿�ѥå��������ɤ߹��ߤ˼��Ԥ��ޤ���!\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "%d �Ĥ����Ǥη����������å���\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr "�ȥ�󥶥���������Υ�����ץȤ�¹���\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "%d �ե�����λ����׻����Ƥ��ޤ���\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "�ե������������׻����Ƥ��ޤ���\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr "��ư������Хå��ȥ�󥶥�������������Ƥ��ޤ���\n"
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr "�ɲä˼��Ԥ��ޤ������ѥå������إå����ɤ߹���ޤ���Ǥ�����\n"
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "rpmpsmStage() ���ɲä˼��Ԥ��ޤ�����\n"
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr "�ɲä˼��Ԥ��ޤ������ե���������μ������Ǥ��ޤ���\n"
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "rpmpsmStage() �Ǻ���˼��Ԥ��ޤ�����\n"
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr "�ȥ�󥶥�������Υ�����ץȤ�¹���\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr "%c %s �����Ĥ���ޤ���"
@@ -3532,60 +3513,60 @@ msgstr "%c %s �����Ĥ���ޤ���"
 msgid "Unknown system error"
 msgstr "�����ʥ����ƥ�: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d ���顼 (%d) (%s �ˤ�����): %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d ���顼 (%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "�ǡ����١����Ķ� %s/%s ���Ĥ��ޤ���\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "�ǡ����١����Ķ� %s/%s �������ޤ�����\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "�ǡ����١����Ķ� %s/%s �򥪡��ץ󤷤ޤ� %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "�ǡ����١�������ǥå��� %s/%s ���Ĥ��ޤ���\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "�ǡ����١�������ǥå��� %s/%s �򸡾ڤ��ޤ�����\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "�ǡ����١�������ǥå��� %s/%s �򥪡��ץ󤷤ޤ� %s (mode=0x%x)\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%s���å�������Ǥ��ޤ��� (%s/%s)\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "��¾"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "��ͭ"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "�ǡ����١�������ǥå��� %s/%s ����å����ޤ�����\n"
@@ -3610,76 +3591,76 @@ msgstr "%s �ˤ��礭/�����᤮��long�ͤ�����ޤ��������åפ��ޤ�\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s �ˤ��礭/�����᤮�������ͤ�����ޤ��������åפ��ޤ�\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "% �θ�� { ������ޤ���"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "%{ �θ�� } ������ޤ���"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "���Υ����ե����ޥå�"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "���Υ���̾"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "�����ʥ���"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "����θ�� ] �����Ԥ���ޤ���"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "ͽ������ ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "ͽ������ }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "����� ? �����Ԥ���ޤ���"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "����� ? �θ�� { �����Ԥ���ޤ���"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "����� } �����Ԥ���ޤ���"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "? ���ּ��θ�� : �����Ԥ���ޤ���"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "����� : �θ�� { �����Ԥ���ޤ���"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "���ν����� | �����Ԥ���ޤ���"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(����ǥå������ϰϳ�)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "����η����֤����꤬�����������ۤʤ�����δ֤ǻ��Ѥ���Ƥ��ޤ�"
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -3702,384 +3683,370 @@ msgstr ""
 msgid "verify database files"
 msgstr "�ǡ����١����θ��ڤ�Ԥ��ޤ���"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "(�Ť�) rpm[23] �ѥå������󥰸ߴ��Υإå����������ޤ���"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: �����ʥ���̾: \"%s\" ��̵�뤷�ޤ�\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s ����ǥå����� db%d �ǥ����ץ�Ǥ��ޤ��� - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "%s ����ǥå����򥪡��ץ�Ǥ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "dbpath �����ꤵ��Ƥ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "���顼(%d) - �쥳���� \"%s\" ������ (%s ����ǥå�������)\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: �����åפ��ޤ���"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "���顼(%d) - �쥳���� #%d �� %s �˳�Ǽ��\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: �����åפ��ޤ���"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 "rpmdb: ��»�����إå����󥹥��� #%u ��������ޤ����������åפ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: �إå����ɤळ�Ȥ��Ǥ��ޤ��� (0x%x)\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "���顼(%d) - �إå� #%d �쥳���ɤ� %s �κ���������\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "\"%s\" �� %s ����ǥå������������ޤ���\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%d ����ȥ�� %s ����ǥå������������ޤ���\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "���顼(%d) - \"%s\" �Υ쥳��������� (%s ����ǥå�������)\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "���顼(%d) - �쥳���� \"%s\" �� %s �˳�Ǽ��\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "���顼(%d) - �쥳���� \"%s\" �� %s ��������\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "���顼(%d) - �������ѥå��������󥹥��󥹤γ�����ƻ�\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: �����åפ��ޤ���"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "\"%s\" �� %s ����ǥå������ɲä��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%d ����ȥ�� %s ����ǥå������ɲä��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "���顼(%d) - �쥳���� %s �� %s �˥��ȥ���\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "db3 �ƹ��ۤ������������ %s �������ޤ���\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "dbpath �����ꤵ��Ƥ��ޤ���"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "�ǡ����١��� %s �� %s �Ȥ��ƺƹ��ۤ��Ƥ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "���Ū�ʥǡ����١��� %s �ϴ���¸�ߤ��Ƥ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "�ǥ��쥯�ȥ�κ���: %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "�ǥ��쥯�ȥ�κ���: %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "�Ť��ǡ����١����� dbapi %d �ǥ����ץ󤷤Ƥ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "�������ǡ����١����� dbapi %d �ǥ����ץ󤷤Ƥ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "�ǡ����١�����Υإå� #%u �������Ǥ� -- �����åפ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "���� %u �ˤ��ä��쥳���ɤ��ɲäǤ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "�ǡ����١����κƹ��ۤ˼���: ���ꥸ�ʥ�Υǡ����١����ϻĤäƤ��ޤ���\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "�Ť��ǡ����١����򿷤����ǡ����١������֤�������Τ˼���!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "��������ˤ� %s ��Υե������ %s ��Υե�������֤������Ʋ�����"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "�ǥ��쥯�ȥ�κ��: %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "�ǥ��쥯�ȥ� %s �κ������: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "�ǡ����١�������ǥå��� %s/%s ���Ĥ��ޤ���\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "�ǡ����١�������ǥå��� %s/%s �򥪡��ץ󤷤ޤ� %s (mode=0x%x)\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== ͭ�� %d �� %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(��)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(��)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "�������åȥХåե��Υ����Хե����Ǥ���\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "�ޥ��� %%%s �ϥܥǥ�����ü���Ƥ��ޤ���\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "�ޥ��� %%%s ��������̾���Ǥ� (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "�ޥ��� %%%s �ϥ��ץ���󤬽�ü����Ƥ��ޤ���\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "�ޥ��� %%%s �Υܥǥ��϶��Ǥ���\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "�ޥ��� %%%s ��Ÿ���˼��Ԥ��ޤ�����\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "�ޥ��� %%%s ��������̾���Ǥ� (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "�ޥ��� %%%s (%s) �ϥ�٥� %d ̤���ǻ��Ѥ���ޤ���Ǥ�����\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "�����ʥ��ץ���� %c (%s(%s)���)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "�Ƶ��ο��� (%d) �������� (%d) ����礭���ʤäƤ��ޤ���\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "��ü����Ƥ��ʤ� %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "%% �θ���˹�ʸ���ϤǤ��ʤ��ޥ�����³���Ƥ��ޤ���\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "�ޥ��� %%%.*s �ϸ��Ĥ���ޤ��󡣥����åפ��ޤ���\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "�ե����� %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "�ե����� %s �� %u �Х��Ȥ�꾮�����ʤäƤ��ޤ���\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "����ι�ʸ�ϥ��ݡ��Ȥ���ޤ���: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "����ι�ʸ�ϥ��ݡ��Ȥ���ޤ���: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite �˼��Ԥ��ޤ���: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "̵���ʥѥå������ֹ�: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek �˼��Ԥ��ޤ���: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "����"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "�����Ф���������ʱ�����"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "������ I/O ���顼�Ǥ���"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "�����Ф������ॢ���Ȥ��ޤ�����"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "�����ФΥۥ��ȥ��ɥ쥹��Ĵ�٤��ޤ���"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "�����ФΥۥ���̾��Ĵ�٤��ޤ���"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "�����ФȤ���³�˼��Ԥ��ޤ�����"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "�����ФȤΥǡ�����³��Ω�˼��Ԥ��ޤ�����"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "��������ե������ I/O ���顼�Ǥ���"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "��⡼�ȥ����Ф� passive �⡼�ɤ�����Ǥ��ޤ���Ǥ�����"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "�����о�˥ե����뤬���Ĥ���ޤ���"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "�����������"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "�����ޤ���ͽ�����̥��顼"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "�ɤ߹��ߤμ���: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(���顼�ʤ�)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "��̿Ū�ʥ��顼: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "���顼: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "�ٹ�: "
 
@@ -4088,41 +4055,77 @@ msgstr "�ٹ�: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "���������� (%u �Х���) �� NULL ���֤��ޤ�����\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url �ݡ��ȤϿ����Ǥʤ���Фʤ�ޤ���\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s �κ����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "�إå����ȥڥ������ɽ�̾�򸡾ڤ��ޤ���"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr "����å���ǡ����١����򹹿����ޤ��󡣥ѥå������ѥ���ɽ���ΤߤǤ���"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr "�ե�����ĥ꡼õ�����ץ����:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: %%{_cache_dbpath} �ޥ���������ߥ��Ǥ���\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ����å������˼��Ԥ��ޤ���: ec %d��\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: manifest ���ɤ߹��ߤ˼���: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: %s ���ɤ߹���: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "�إå��ν�ü�ν񤭹��ߤ��Ǥ��ޤ���\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "����ե����� %s �κ����˼��Ԥ��ޤ�����\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr ""
+#~ "���ΥС������� RPM �ǤϥС������ 1 �Υѥå������󥰤ϥ��ݡ��Ȥ��Ƥ��ޤ�"
+#~ "��\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "���ΥС������� RPM �Ǥϥ᥸�㡼�ֹ� <=4 �Υѥå����������Τߥ��ݡ��Ȥ���"
+#~ "���ޤ�\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: v1.0 �� RPM �ѥå������ˤϽ�̾�Ǥ��ޤ���\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: v2.0 �� RPM �ѥå������ˤϺƽ�̾�Ǥ��ޤ���\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: ��̾������ޤ��� (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "�ե����� %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "�ե����� %s �� %u �Х��Ȥ�꾮�����ʤäƤ��ޤ���\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "%s �Τ���ΰ�¸�����������Ƥ��ޤ���: "
diff --git a/po/ko.po b/po/ko.po
index f5d0f5e1d..d81c53668 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -10,52 +10,52 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "������ ������ ���� ���ۿ� ������:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "%s spec ������ �� �� ����: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "tar �������� ���µ� ������: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "%s���� spec ������ �дµ� �����߽��ϴ�\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "%s�� �̸��� %s(��)�� �����ϴµ� ������: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "%s�� ����(stat)�� ǥ���ϴµ� ������: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s ������ ����(regular) ������ �ƴմϴ�.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s ������ spec ������ �ƴ� �� �����ϴ�.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "��ǥ���(target) �÷������� ���� ��: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "%s(��)�� �����ϰ� �ֽ��ϴ�\n"
@@ -75,179 +75,179 @@ msgstr "��Ű���� ����� �д� ���� ������ �߻��߽��ϴ�\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "payload�� �ٽ� �� �� ����: %s\n"
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "���� �ɼ� (-q �Ǵ� --query �ɼǰ� �Բ� ���):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "���� �ɼ� (-V �Ǵ� --verify �ɼǰ� �Բ� ���):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "���� �ɼ� (-V �Ǵ� --verify �ɼǰ� �Բ� ���):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "���� �ɼ�:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "�����ͺ��̽� �ɼ�:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "������ �Բ� ����ϴ� ���� �ɼ� [ <spec����> | <tar����> | <�ҽ� ��Ű��> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "��ġ/���׷��̵�/���� �ɼ�:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "��� rpm ��忡���� �Ϲ����� �ɼ�:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ���� - %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "�� ���α׷��� GNU Public License ������ �����Ӱ� ������� �� �ֽ��ϴ�"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "�μ� ó������ (%d) ���� ���� ������ �߻��߽��ϴ� :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "�ϳ��� ��(major) ��常 ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "����/���� ������ ���� �ٸ� ������ ���ÿ� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "�������� ���� �÷��� �Դϴ�"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "�������� ���� ���� �Դϴ�"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "�������� ���� �ҽ� �Դϴ�"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "��ġ, ���׷��̵�, �ҽ� ����, spec ���� �����ÿ��� ����˴ϴ�"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "��Ű�� ��ġ�ÿ��� ������ ���ġ�� �� �ֽ��ϴ�"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate �� --excludepath �ɼ��� �ֽ��� ��Ű���� ��ġ�� ������ ����� �� ��"
 "���ϴ�"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix �ɼ��� �ֽ��� ��Ű���� ��ġ�� ������ ����� �� �ֽ��ϴ�"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix �ɼ��� �μ��� �ݵ�� '/' �� �����ؾ� �մϴ�"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs �� --includedocs �ɼǸ� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches �ɼ��� ��Ű�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "��ũ��Ʈ ���� �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "Ʈ���� ���� �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -255,13 +255,13 @@ msgstr ""
 "--nodeps �ɼ��� ��Ű�� ����, ������(rebuild), ��������(recompile), ��ġ, ��"
 "��, �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test �ɼ��� ��Ű�� ��ġ, ����, ���۽ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -269,106 +269,106 @@ msgstr ""
 "--root (-r) �ɼ��� ��Ű�� ��ġ, ����, ����, �����ͺ��̽� �籸��ÿ��� ������ "
 "�� �ֽ��ϴ�"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) �ɼ��� �μ��� �ݵ�� '/' �� �����ؾ� �մϴ�"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "������ ������ �����ϴ�\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s ���Ͽ� ������ �� �����ϴ�\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp�� � �� ����: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "�н� ����(pass phrase) �Է�: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "�н� ����(pass phrase)�� �ùٸ��� �ʽ��ϴ�\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "�н� ����(pass phrase)�� ��ġ�մϴ�.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "��ũ�� ���Ͽ� �������� %%_signature�� ������ �ֽ��ϴ�.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign �ɼ��� ��Ű�� ���۽ÿ��� ����� �� �ֽ��ϴ�"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "���࿡ �����߽��ϴ�\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "������(rebuild)�� ��Ű�� ������ �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "��Ű�� ���ۿ� �ʿ��� spec ������ �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "��Ű�� ���ۿ� �ʿ��� tar ������ �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "������ ��Ű���� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "��ġ�� ��Ű���� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "������ �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "�ӽ� ������ �� �� �����ϴ�.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "���� ��(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s�� ���࿡ ������ (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s�� �߸��� ���� ��Ȳ (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -427,92 +427,92 @@ msgstr "'&&' �� '||' �� ���ڿ����� ����� �� �����ϴ�\n"
 msgid "syntax error in expression\n"
 msgstr "ǥ���Ŀ��� ���� ������ �߻��߽��ϴ�\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK ����: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "%s %s�� '(' �� �����ϴ�\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "%s(%s�� ')' �� �����ϴ�\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "�������� %s ��ū: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%2$s %3$s�� %1$s �� �����ϴ�\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() ������ ������ ����: %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "�߸��� ����: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "�߸��� ��� spec: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "�߸��� dir��� spec: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, fuzzy, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "���������� ������ ����: %%lang(%2$s)�� \"%1$.*s\"\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, fuzzy, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "%%lang(%2$s)�� �ߺ��� ������ %1$.*s�� �����մϴ�\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "%%docdir�� �Ѱ谡 �ʰ��Ǿ����ϴ�\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "%%docdir�� �ϳ��� �μ��� ������ �� �ֽ��ϴ�\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "�ϳ��� �࿡ �ΰ��� ������ ������: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "������ �ݵ�� \"/\" �� �����ؾ���: %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Ư�� %%doc�� �ٸ� ���İ� �Բ� ����� �� ����: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "���� ����� �ߺ���: %s\n"
@@ -542,7 +542,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead�� �����߽��ϴ�\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -562,7 +562,7 @@ msgstr "������ \"/\" �� �����ؾ���: %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob�� ����� �� ����: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "glob���� ������ � �� ����: %s\n"
@@ -572,7 +572,7 @@ msgstr "glob���� ������ � �� ����: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%s ������ %%files�� �� �� ����: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "��: %s\n"
@@ -582,7 +582,7 @@ msgstr "��: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "�߸��� ����: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�߸��� ������/�׷�: %s\n"
@@ -604,181 +604,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "���� ó�� ��: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "����� �̸� ����[getUname]: uid�� �ʹ� �����ϴ�\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "����� �̸� ����[getUnameS]: uid�� �ʹ� �����ϴ�\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "����� id ����[getUidS]: uid�� �ʹ� �����ϴ�\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "�׷� �̸� ����[getGname]: gid�� �ʹ� �����ϴ�\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "�׷� �̸� ����[getGnameS]: gid�� �ʹ� �����ϴ�\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "�׷� id ����[getGidS]: gid�� �ʹ� �����ϴ�\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "ȣ��Ʈ���� ����ȭ(canonicalize) �� �� ����: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "%s ������ ��ī�̺긦 �����ϴµ� ������: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "��ī�̺� ������ ������: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy �ۼ��� ������: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy �б⿡ ������: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn ������ �� �� ����: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn ������ �� �� ����: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn ������ �� �� ����: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn ������ �� �� ����: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript ������ �� �� ����: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Ʈ���� ��ũ��Ʈ ������ �� �� ����: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "RPM �б�(readRPM): %s(��)�� ���ϴ�: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "RPM �б�(readRPM): %s(��)�� �н��ϴ�: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek�� �����߽��ϴ�: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "RPM �б�(readRPM): %s(��)�� RPM ��Ű���� �ƴմϴ�\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "RPM �б�(readRPM): %s���� ����� �а� �ֽ��ϴ�\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "���� ��� ����(immutable header region)�� ������ �� �����ϴ�.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "�ӽ�(temp) ����� �ۼ��� �� �����ϴ�\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "�߸��� CSA ������\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "������(final) ����� �ۼ��� �� �����ϴ�\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "���� ���� ��: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "����(signature) ����� �ٽ� �о�� �� �����ϴ�.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s(��)�� �� �� ����: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "��Ű���� �ۼ��� �� ����: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "������ ��� %s(��)�� �� �� ����: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s�� ����� ���� �� ����: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s�� ����� �ۼ��� �� ����: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s�� payload�� ���� �� ����: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s�� payload�� �ۼ��� �� ����: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "�ۼ�: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s ��Ű���� ��� ���ϸ��� ������ �� ����: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s(��)�� ������ �� ����: %s\n"
@@ -788,32 +779,32 @@ msgstr "%s(��)�� ������ �� ����: %s\n"
 msgid "line %d: second %s\n"
 msgstr "%d ��° ��: �ι�° %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "%%changelog �׸�(entry)�� �ݵ�� '*' �� �����ؾ� �մϴ�\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "%%changelog �׸�(entry)�� �������� �ʽ��ϴ�\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "%%changelog�� �߸��� ��¥: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog�� ��¥(chronological) ������ �Ǿ����� �ʽ��ϴ�\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "%%changelog�� �̸��� �����ֽ��ϴ�\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "%%changelog�� ����(description)�� �����ϴ�\n"
@@ -823,17 +814,17 @@ msgstr "%%changelog�� ����(description)�� �����ϴ�\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d ��° ��: %%description���� ������ �߻��߽��ϴ�: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d ��° ��: %s(��)�� �߸��� �ɼ��Դϴ�: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "%d ��° ��: �̸��� �ʹ� �����ϴ�: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "%d ��° ��: ��Ű���� �������� �ʽ��ϴ�: %s\n"
@@ -843,210 +834,210 @@ msgstr "%d ��° ��: ��Ű���� �������� �ʽ��ϴ�: %s\n"
 msgid "line %d: Second description\n"
 msgstr "%d ��° ��: �ι�° ����(description)\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "%d ��° ��: %%files���� ������ �߻��߽��ϴ�: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "%d ��° ��: �ι�° %%files ���\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "��Ű���İ� ���ܵ�: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "��Ű���İ� ���ԵǾ� ���� ����: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "�ü���� ���ܵ�: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "�ü���� ���ԵǾ� ���� ����: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "��Ű���� �ݵ�� %s �׸�(field)�� �����ؾ���: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "��Ű���� %s �׸�(entry)�� �ߺ��Ǿ� ����: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "%s �������� �� �� ����: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "%s �������� ���� �� ����: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "�� �� ���� ������ ����: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "%d ��° ��: �±׿� �ϳ��� ��ū�� �ֽ��ϴ�: %s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "%d ��° ��: �ùٸ��� ���� �±��Դϴ�: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "%d ��° ��: �±װ� ����ֽ��ϴ�: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "%d ��° ��: %s�� �������� ���� '-' �� ����: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot�� \"/\" �� ������ �� ����: %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "%d ��° ��: Prefixes�� ���� \"/\" �� �������� �ȵ˴ϴ�: %s\n"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "%d ��° ��: Docdir�� �ݵ�� '/' �� �����ؾ� �մϴ�: %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "%d ��° ��: Epoch/Serial �׸�(field)�� �ݵ�� �����̾�� �մϴ�: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "%d ��° ��: �߸��� %s: ������(qualifier): %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "%d ��° ��: �߸��� BuildArchitecture �����Դϴ�: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "���� ����: ���Ž�(Bogus) �±� %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "�߸��� ��Ű�� ����: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "��Ű���� �̹� ������: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "%d ��° ��: �� �� ���� �±��Դϴ�: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec ������ BuildRoot�� ����� �� �����ϴ�\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "�߸��� �ҽ�: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "��ġ ��ȣ %d�� �����ϴ�\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "�ҽ� ��ȣ %d�� �����ϴ�\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "nosource %s(��)�� �ٿ�ε��� �� ����: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "%%setup���� ���� �߻�: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "%d ��° ��: %%setup�� �߸��� �μ��� �ֽ��ϴ�: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "%d ��° ��: %%setup�� �߸��� %s �ɼ�: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "%d ��° ��: %%patch -b �� �μ��� �ʿ��մϴ�: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "%d ��° ��: %%patch -z �� �μ��� �ʿ��մϴ�: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "%d ��° ��: %%patch -p �� �߸��� �μ��� �ֽ��ϴ�: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "%d ��° ��: %%patch -p �� �μ��� �ʿ��մϴ�: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "%d ��° ��: %%patch -p �� �߸��� �μ��� �ֽ��ϴ�: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "��ġ�� �ʹ� �����ϴ�!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "%d ��° ��: %%patch�� �߸��� �μ��� �ֽ��ϴ�: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "%d ��° ��: �ι�° %%prep\n"
@@ -1099,293 +1090,297 @@ msgstr "%d ��° ��: �ι�° %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "%d ��° ��: %%description���� ������ �߻��߽��ϴ�: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "%d ��° ��: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s(��)�� �� �� ����: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if�� ������ �ʾҽ��ϴ�\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean���� %d ���� ��ȯ�Ǿ����ϴ�\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else�� %%if ���� ���Ǿ����ϴ�\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif�� %%if ���� ���Ǿ����ϴ�\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include ���� �ùٸ��� �ʽ��ϴ�\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "��Ű�� ���ۿ� ȣȯ�ϴ� ��Ű���ĸ� ã�� �� �����ϴ�\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "������ %%description�� ����: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot�� �̹� �����Ǿ� �ֽ��ϴ�, %s(��)�� �����մϴ�\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "<spec����>�� %prep (�ҽ��� Ǯ�� ��ġ�� �����ϴ� ����)���� �����մϴ�"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<spec����>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "<spec����>�� %build (%prep�� �������ϴ� ����)���� �����մϴ�"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "<spec����>�� %install (%prep, %build�� ��ġ�ϴ� ����)���� �����մϴ�"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "<spec����>�� %files �׸�(section)�� �˻��մϴ�"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "<spec����>�� �ҽ��� ���̳ʸ� ��Ű���� �����մϴ�"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "<spec����>�� ���̳ʸ� ��Ű�� ���� �����մϴ�"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "<spec����>�� �ҽ� ��Ű�� ���� �����մϴ�"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "<tar����>�� %prep (�ҽ��� Ǯ�� ��ġ�� �����ϴ� ����)���� �����մϴ�"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tar����>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "<tar����>�� %build (%prep�� �������ϴ� ����)���� �����մϴ�"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "<tar����>�� %install (%prep, %build�� ��ġ�ϴ� ����)���� �����մϴ�"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "<tar����>�� %files �׸�(section)�� �˻��մϴ�"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "<tar����>�� �ҽ��� ���̳ʸ� ��Ű���� �����մϴ�"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "<tar����>�� ���̳ʸ� ��Ű�� ���� �����մϴ�"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "<tar����>�� �ҽ� ��Ű�� ���� �����մϴ�"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "<�ҽ� ��Ű��>�� ���̳ʸ� ��Ű���� �����մϴ�"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<�ҽ� ��Ű��>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "<�ҽ� ��Ű��>�� %install (%prep, %build�� ��ġ�ϴ� ����)���� �����մϴ�"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "buildroot�� ��ü(override)�մϴ�"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "��Ű�� ���� �Ŀ� �ҽ� ������ Ǯ�� �۾��� ���丮�� �����մϴ�"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "rpm4 ��Ű¡�� ȣȯ�ϴ� ����� �����մϴ�"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ExcludeArch�� ������: spec ���Ͽ��� ����(directive)�˴ϴ�"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "��ǻ���� ����(state) ������ ����� �մϴ�"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "��Ű�� ������ ��� �ܰ赵 �������� �ʽ��ϴ�"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "��Ű�� ���� �������� �˻����� �ʽ��ϴ�"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "(������) rpm[23] ��Ű¡�� ȣȯ�ϴ� ��Ű�� ����� �����մϴ�"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "��Ű���� �������� �˻����� �ʽ��ϴ�"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "��Ű���� ��Ű���ĸ� �˻����� �ʽ��ϴ�"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "��Ű���� ������ �˻��մϴ�"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "spec������ i18N msgstr�� ���(accept)���� �ʽ��ϴ�"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "��Ű�� ���� �Ŀ� �ҽ� ������ �����մϴ�"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "��Ű�� ���� �Ŀ� spec������ �����մϴ�"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "������ �ܰ�� �ٷ� �����մϴ� (c,i ������ ��� ����)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "PGP/GPG ������ �ۼ��մϴ�"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "��ǥ���(target) �÷����� ��ü(override)�մϴ�"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "spec���� ���(catalog)���� i18N ���ڿ��� �˻��մϴ�"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "(������) rpm[23] ��Ű¡�� ȣȯ�ϴ� ����� �����մϴ�"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s(��)�� ������ �� ����: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s(��)�� fork �� �� ����: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s(��)�� �����߽��ϴ�\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "%s�� ��� �ڷḦ ����ϴµ� �����߽��ϴ�\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "%s(��)�� ���µ� ������: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s %s ���丮 ������ ������: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s %s ���丮 ������ ������: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "%s(��)�� � ��: (%s ���)...\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s(��)�� �� ������:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "%d ��° ��: �߸��� �����Դϴ�: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "%d ��° ��: no%s(��)�� �߸��� �����Դϴ�: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "%d ��° ��: %s(��)�� �߸��� �����Դϴ�: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s(��)�� ������ �� ����: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1432,55 +1427,55 @@ msgstr "����� ��ī�̺� ������ �����ϴ�"
 msgid " failed - "
 msgstr " ������ - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "%s ��Ű���� �̹� ��ġ�Ǿ� �ֽ��ϴ�"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "%s ��Ű���� �̹� ��ġ�Ǿ� �ֽ��ϴ�"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s �� (rpmlib�� ������)\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "�߸��� db ���� %s\n"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s �� (db�� ������)\n"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "������ ���õ� ��Ű�� �̸��� �����մϴ� [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort ���迡�� %s-%s-%s \"%s\"(��)�� �����մϴ�.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort ���踦 ���(record)�մϴ�\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1489,26 +1484,26 @@ msgstr ""
 "========== ��Ű���� tsort �մϴ� (����, #������, #������, Ʈ��, ����"
 "[depth])\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== �����ڸ� [successors only] (ǥ�� ��)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "����(LOOP):\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort�� �����մϴ�...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(���ڰ� �ƴմϴ�)"
 
@@ -1520,16 +1515,16 @@ msgstr "(base64�� �ƴմϴ�)"
 msgid "(invalid type)"
 msgstr "(�������� Ÿ��)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(BLOB[Binary Large OBject]�� �ƴմϴ�)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 #, fuzzy
 msgid "(invalid xml type)"
 msgstr "(�������� Ÿ��)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "��� PGP ������ �˻����� �ʽ��ϴ�"
@@ -1549,7 +1544,7 @@ msgstr "mntctl()���� ����Ʈ�� ������ ��ȯ�ϴµ� ������: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "%s�� ����(stat)�� ǥ���ϴµ� ������: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s(��)�� ���µ� ������: %s\n"
@@ -1564,12 +1559,12 @@ msgstr "����%5d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "%s ������ �� �� ���� ��ġ �� �ֽ��ϴ�\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========= ��Ű���� ���丮�� ���ԵǾ� ���� ����:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
@@ -1624,47 +1619,42 @@ msgstr "%s %s ��ũ ������ ������: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s(��)�� %s(��)�� �����Ǿ����ϴ�\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "%2$s �ε����� %1$d �׸��(entries)�� �߰��մϴ�.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s %s(��)�� ������ �� �����ϴ�\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s(��)�� �ۼ��� �� �����ϴ�\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "�ӽ� ���� %s(��)�� �����ϴ� ���� ������ �߻��߽��ϴ�\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1719,189 +1709,180 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "�� RPM ������ ��Ű¡ ���� '1' �� �������� �ʽ��ϴ�\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "�� RPM ������ �� ��ȣ(major number)�� <= 4 �� ��Ű¡ ���� �����մϴ�\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature�� �����߽��ϴ�\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ��ȿ�� ������ �����ϴ�\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead�� �����߽��ϴ�\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread�� �����߽��ϴ�: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s(��)�� ��ġ�� �� �����ϴ�\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "%s ���丮�� �����մϴ�\n"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "<ǥ����>+ �� ��ũ�� Ȯ���� ����մϴ�"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "�⺻ ��ũ�� ���� ��� <����:..>�� �о���Դϴ�"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "libio(3) API�� ����� �����մϴ�"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "ǥ������� <����>���� �����ϴ�"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "<���丮>�� �ֻ��� ���丮�� ����մϴ�"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "���� �±׸� �����ݴϴ�"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "���� �����Ǿ� �ִ� rpmrc�� ����� ��ũ�θ� �����ݴϴ�"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "�ڼ��� ����� �����մϴ�"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "���� ���� ����� �����մϴ�"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "���� ���ǰ� �ִ� rpm ������ ǥ���մϴ�"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "��ǻ���� ����(state) ������ ����� �մϴ�"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "��ǻ���� ����(state) ������ ����� �մϴ�"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "�μ� ó������ (%d) ���� ���� ������ �߻��߽��ϴ� :-(\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "��ǻ���� ����(state) ������ ����� �մϴ�"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "��ǻ���� ����(state) ������ ����� �մϴ�"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "rpmio ��/����� ����� �մϴ�"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "URL ij�� �ڵ鸵�� ����� �մϴ�"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2342,7 +2323,7 @@ msgstr "��Ű�� ���� ������ �˻����� �ʽ��ϴ�"
 msgid "don't verify files in package"
 msgstr "��Ű�� ���� ������ �˻����� �ʽ��ϴ�"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "��Ű���� �������� �˻����� �ʽ��ϴ�"
 
@@ -2389,105 +2370,105 @@ msgstr "��Ű���� �����մϴ� (������ ������ �����˴ϴ�)"
 msgid "generate signature"
 msgstr "������ �ۼ��մϴ�"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "�ҽ� ��Ű���� �ʿ��ϸ�, ���̳ʸ��� �˻��Ǿ����ϴ�\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "�ҽ� ��Ű���� .spec ������ ���ԵǾ� ���� �ʽ��ϴ�\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s ��ũ��Ʈ�� �����մϴ� (���� ���)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 "%s: %s ��ũ��Ʋ��(scriptlet)�� �����߽��ϴ� (%d), %s-%s-%s(��)�� �����մϴ�\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr ""
 "%2$s-%3$s-%4$s�� %1$s ��ũ��Ʋ��(scriptlet) ���࿡ �����߽��ϴ�, ���� ��Ȳ %5"
 "$d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 "%2$s-%3$s-%4$s�� %1$s ��ũ��Ʋ��(scriptlet) ���࿡ �����߽��ϴ�, ���� ��Ȳ %5"
 "$d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s�� %d�� ������ �ֽ��ϴ�, �׽�Ʈ = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 "%s: %s ��ũ��Ʋ��(scriptlet)�� �����߽��ϴ� (%d), %s-%s-%s(��)�� �����մϴ�\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "����(signature) ����� �ٽ� �о�� �� �����ϴ�.\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "��ī�̺긦 Ǫ�µ� ������%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " ���� ������ "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ������ %1$s(��)�� ������: %3$s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s(��)�� ������: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "�ùٸ��� ���� ����: %s\n"
@@ -2589,128 +2570,109 @@ msgstr "��Ű�� ���(record) ��ȣ: %u\n"
 msgid "record %u could not be read\n"
 msgstr "���(record) ��ȣ %u(��)�� ���� �� �����ϴ�\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ��Ű���� ��ġ�Ǿ� ���� �ʽ��ϴ�\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "�߸��� db ���� %s\n"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s �� (������ �߰���)\n"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ���µ� �����߽��ϴ�: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile�� �����߽��ϴ�\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite�� �����߽��ϴ�: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek�� �����߽��ϴ�: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "�μ� ������ RPM ��Ű���� �����Ǿ�� �մϴ�\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: v1.0 RPM�� ������ �� �����ϴ�\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: v2.0 RPM�� ��-������ �� �����ϴ�\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead�� �����߽��ϴ�: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature�� �����߽��ϴ�: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: readLead�� �����߽��ϴ�\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: readLead�� �����߽��ϴ�\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead�� �����߽��ϴ�\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead�� �����߽��ϴ�\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: ��ȿ�� ������ �����ϴ� (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "�ùٸ��� ����"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (Ű�� ã�� �� ����:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (Ű�� �ŷ��� �� ����:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "Ȯ��"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "�ƴϿ�"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "��"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2719,72 +2681,68 @@ msgstr ""
 "\"B\" �������� �߿�� �Ǵ� ��(epoch)�� �ʿ�� �մϴ� (\"A\" �� �����մϴ�)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "%s ��Ű���� �ʿ����(����)�� �������� ����: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok �÷��׷� ���� %s(��)�� �����մϴ�\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== ���ġ\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ����  %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ���ġ %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s(��)�� ���ܽ�ŵ�ϴ�\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s(��)�� %s(��)�� ���ġ �մϴ�\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s ���丮�� %s(��)�� ���ġ �մϴ�\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s(��)�� ���µ� ������: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "�� �� ���� �±� �Դϴ�"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "������ ������ ���� ������:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "�غ� ��..."
@@ -2812,105 +2770,120 @@ msgstr "�غ� ��..."
 msgid "Upgrading packages..."
 msgstr "��Ű���� ���׷��̵� �մϴ�"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "%s(��)�� � ��: (%s ���)...\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s(��)�� �����մϴ�\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... %s(��)��\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s(��)�� �����մϴ� - ����(transfer)�� ������ - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s(��)�� ��ġ�� �� �����ϴ�\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<�ҽ� ��Ű��>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "%s ��Ű���� ���ġ�� �� �����ϴ�\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "���̳ʸ� ��Ű���� ��ġ�մϴ�\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s ������ �д� ���� ������ �߻��߽��ϴ�\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s ������ �ֽ� ������ RPM�� �ʿ�� �մϴ�\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s(��)�� ��ġ�ϴ� ��Ű���� ����: %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d�� �ҽ��� %d�� ���̳ʸ� ��Ű���� �˻��Ǿ����ϴ�\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "���̳ʸ� ��Ű���� ��ġ�մϴ�\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s ������ �� �� ����: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" �������� ��Ű���� �����մϴ�\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s(��)�� �� �� ����: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s(��)�� ��ġ�մϴ�\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "%s(��)�� �����մϴ�\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "�μ� ������ RPM ��Ű���� �����Ǿ�� �մϴ�\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: ��ȿ�� ������ �����ϴ�\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "�� ������: %s (%d)\n"
@@ -2956,605 +2929,609 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "'-' �� ���ڿ����� ����� �� �����ϴ�\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "%2$s/%3$s�� ��ݵ�(lock) %1$s(��)�� ���� �� �����ϴ�\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "%2$s/%3$s�� ��ݵ�(lock) %1$s(��)�� ���� �� �����ϴ�\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "%s(��)�� �ٸ� ��Ű���ĸ� ���� ��Ű���Դϴ�"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "%s(��)�� �ٸ� �ü���� ���� ��Ű���Դϴ�"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "%s ��Ű���� �̹� ��ġ�Ǿ� �ֽ��ϴ�"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "%2$s ��Ű�� ���� %1$s ��δ� ���ġ�� �� �����ϴ�"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "%2$s(��)�� %3$s�� ��ġ �������� %1$s ������ ���� �浹�մϴ�"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "%2$s���� ��ġ�Ǵ� %1$s ������ %3$s ��Ű���� ���ϰ� �浹�մϴ�"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "%s ��Ű�� (%s ���� �ֽ��� ��Ű��)�� �̹� ��ġ�Ǿ� �ֽ��ϴ�"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 "%4$s ���Ͻý��� �󿡼� %1$s ��Ű���� ��ġ�� ��쿡�� %2$ld%3$cb(��)�� �ʿ���"
 "�ϴ�"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "%3$s ���Ͻý��� �󿡼� %1$s ��Ű���� ��ġ�� ��쿡�� %2$ld�� ���̳��(inode)"
 "�� �ʿ��մϴ�"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " (��)�� %s-%s-%s ���� �ʿ�� �մϴ�\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "��ġ�Ǿ� ���� ����  "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " %s-%s-%s (��)�� �浹�մϴ�\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 "%2$s ��Ű���� ó���ϴ� �������� �� �� ���� ���� %1$d(��)�� �߻��߽��ϴ�"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "%s�� �� ':' �� ����:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s�� ��Ű���ĸ��� ����:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s�� ������ �׸�(line)�� �������:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s�� ������ �׸�(line)�� �μ��� �ʹ� ����:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "�߸��� ��Ű����/�ü�� ��ȣ: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s�� �⺻ �׸�(line)�� �������:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s�� �⺻ �׸�(line)�� �μ��� �ʹ� ����:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s(��)�� �� ������: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "%2$s�� ':' (0x%1$02x �) �� ����:%3$d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%2$s�� %1$s(��)�� ���� ��� ����:%3$d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%2$s�� %1$s Ȯ��(expansion)�� ������:%3$d \"%4$s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%2$s�� %1$s(��)�� �� �� ����:%3$d: %4$s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%2$s�� %1$s(��)�� ���� ��Ű���İ� ����:%3$d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "%2$s�� �߸��� '%1$s' �ɼ�:%3$d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "�� �� ���� �ý���: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "%s(��)�� Ȯ��(expand)�� �� �����ϴ�\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "%s(��)�� ���� �� �����ϴ�, HOME�� �ʹ� Ů�ϴ�.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s(��)�� �� �� ����: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s ���� ��Ű�� �����ͺ��̽��� �� �� �����ϴ�\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "�������� ��Ű�� ��ȣ: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "%s %s�� '(' �� �����ϴ�\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "�������� ��Ű�� ��ȣ: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "%s�� rpm �����ͺ��̽��� �� �� �����ϴ�\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "��: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "%s(��)�� �����մϴ�\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "����%5d: %07o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "%s(��)�� %s(��)�� ���ġ �մϴ�\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "����(Expected) �뷮: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr " ���� �뷮: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "����: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s(��)�� ������ �� ����: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp�� ������\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp ������ �ۼ��ϴµ� �����߽��ϴ�\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ���� �뷮: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "������ ���� �� �����ϴ�\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "%d ����Ʈ�� PGP ������ ������ϴ�\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "���࿡ �����߽��ϴ�\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "gpg ������ �ۼ��ϴµ� �����߽��ϴ�\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ���� �뷮: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "%d ����Ʈ�� GPG ������ ������ϴ�\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "��ũ�� ���� �ȿ� �������� %%_signature ����(spec)�� �ֽ��ϴ�\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "��ũ�� ���� �ȿ� �ݵ�� \"%%_gpg_name\"�� �����ؾ� �մϴ�\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "��ũ�� ���� �ȿ� �ݵ�� \"%%_pgp_name\"�� �����ؾ� �մϴ�\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "����� ũ�Ⱑ �ʹ� Ů�ϴ�"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "SHA1 ���(digest) ����� �˻����� �ʽ��ϴ�"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "������ �����ϴ�\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "������ �����ϴ�\n"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "�ջ�� MD5 ���(digest): �������� ����\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "����: size(%d)+pad(%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s ���丮�� ���ܽ�ŵ�ϴ�\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "�ҽ� ��Ű���� �ʿ��ϸ�, ���̳ʸ��� �˻��Ǿ����ϴ�\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "%s(��)�� ��ġ�ϴ� ��Ű���� ����: %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<�ҽ� ��Ű��>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<�ҽ� ��Ű��>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "��Ű���� ����� �д� ���� ������ �߻��߽��ϴ�\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "������ � �� ����    %s"
@@ -3564,60 +3541,60 @@ msgstr "������ � �� ����    %s"
 msgid "Unknown system error"
 msgstr "�� �� ���� �ý���: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "%3$s�� db%1$d ����(%2$d): %4$s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d ����(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "����    db ȯ��        %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "������  db ȯ��        %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "������  db ȯ��        %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "����    db ���      %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "������  db ���      %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "������  db ���      %s/%s %s ���=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%2$s/%3$s�� ��ݵ�(lock) %1$s(��)�� ���� �� �����ϴ�\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "�����(exclusive)"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "������"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "��ݵ�  db �ε���      %s/%s\n"
@@ -3642,76 +3619,76 @@ msgstr "%s(��)�� �ʹ� ũ�ų� �ʹ� ���� ����(long) ���Դϴ�, �����մϴ�\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s(��)�� �ʹ� ũ�ų� �ʹ� ���� ����(int) ���Դϴ�, �����մϴ�\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "'%' �ڿ� '{' �� �����ϴ�"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "'%{' �ڿ� '}' �� �����ϴ�"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "�±� ������ ����ֽ��ϴ�"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "�±� �̸��� ����ֽ��ϴ�"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "�� �� ���� �±� �Դϴ�"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "�迭�� ���κп� ']' �� �;��մϴ�"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "���ʿ��� ']' �� �ֽ��ϴ�"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "���ʿ��� '}' �� �ֽ��ϴ�"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "ǥ���Ŀ� '?' �� �;��մϴ�"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "ǥ������ '?' �ڿ� '{' �� �;��մϴ�"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "ǥ���Ŀ� '}' �� �;��մϴ�"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "'?' �Ϻ�ǥ����(subexpression) �ڿ� ':' �� �;��մϴ�"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "ǥ������ ':' �ڿ� '{' �� �;��մϴ�"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "ǥ������ ���κп� '|' �� �;��մϴ�"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3734,391 +3711,377 @@ msgstr ""
 msgid "verify database files"
 msgstr "�����ͺ��̽� ������ �˻��մϴ�"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "(������) rpm[23] ��Ű¡�� ȣȯ�ϴ� ����� �����մϴ�"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 "DB �±� �ʱ�ȭ[dbiTagsInit]: �������� ���� �±� �̸�: \"%s\"(��)�� ���õ˴�"
 "��\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "db%2$d(��)�� �̿��Ͽ� %1$s �ε����� �� �� �����ϴ� - %3$s (%4$d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "%s �ε����� �� �� �����ϴ�\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "db��ΰ� �����Ǿ� ���� �ʽ��ϴ�\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "%3$s(��)�� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: �ջ�� ��� #%u(��)�� ����(retrieved)�Ǿ����ϴ�, �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x�� ����� ���� �� �����ϴ�\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%2$s �ε������� \"%1$s\"(��)�� �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%2$s �ε������� %1$d �׸��(entries)�� �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "%3$s(��)�� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "%3$s���� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "���ο� ��Ű���� ��ġ�ϴ� ���� ����(%d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: �ջ�� ��� #%u(��)�� ����(retrieved)�Ǿ����ϴ�, �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%2$s �ε����� \"%1$s\"(��)�� �߰��մϴ�.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%2$s �ε����� %1$d �׸��(entries)�� �߰��մϴ�.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "%3$s(��)�� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "db3�� �籸���� �Ŀ� %s(��)�� �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "db��ΰ� �����Ǿ� ���� �ʽ��ϴ�"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%2$s�� %1$s �����ͺ��̽��� �籸�� �մϴ�\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "�ӽ� �����ͺ��̽� %s(��)�� �̹� �����մϴ�\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s ���丮�� �����մϴ�\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s ���丮�� ������: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "dbapi %d�� ���� �����ͺ��̽��� ���ϴ�\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "dbapi %d�� ���ο� �����ͺ��̽��� ���ϴ�\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "�����ͺ��̽��� ���ڵ� ��ȣ %u(��)�� �߸��Ǿ����ϴ� -- �����մϴ�.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%u�� ó������ ���ڵ带 �߰��� �� �����ϴ�\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "�����ͺ��̽��� �籸���ϴµ� ������: ���� �����ͺ��̽��� �״�� �����˴ϴ�\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "���� �����ͺ��̽��� ���ο� �����ͺ��̽��� ��ü�ϴµ� �����߽��ϴ�!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "�����ϱ� ���� %2$s�� ������ %1$s�� ���Ϸ� ��ü�մϴ�"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s ���丮�� �����մϴ�\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s ���丮�� �����ϴµ� ������: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "����   db ����        %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "������  db ���      %s/%s %s ���=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d Ȱ�� %d �������\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(�������)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(�������)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "��ǥ���(Target) ���� �����÷ο�\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "��ũ�� %%%s�� ������� ���� ����(body)�� �ֽ��ϴ�\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "��ũ�� %%%s�� �������� �̸��� �ֽ��ϴ� (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "��ũ�� %%%s�� ������� ���� �ɼ��� �ֽ��ϴ�\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "��ũ�� %%%s�� ����ִ� ����(body)�� �ֽ��ϴ�\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "��ũ�� %%%s(��)�� Ȯ��(expand)�ϴµ� �����߽��ϴ�\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "��ũ�� %%%s�� �������� �̸��� �ֽ��ϴ� (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "��ũ�� %%%s (%s)�� ���� %d ���Ͽ����� ����� �� �����ϴ�\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%2$s(%3$s)�� �� �� ���� �ɼ� %1$c(��)�� �ֽ��ϴ�\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "�ݺ� Ƚ��(%d)�� �ִ�ġ(%d) ���� Ů�ϴ�\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c(��)�� ������� ����: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "'%%' ������ ó���� �� ����(unparseable) ��ũ�ΰ� �ֽ��ϴ�\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "��ũ�� %%%.*s�� ã�� �� �����ϴ�, �����մϴ�\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "%s ����: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "%s ������ %u ����Ʈ ���� �����ϴ�\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "'-' �� ���ڿ����� ����� �� �����ϴ�\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "'-' �� ���ڿ����� ����� �� �����ϴ�\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite�� �����߽��ϴ�: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "�������� ��Ű�� ��ȣ: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek�� �����߽��ϴ�: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "����"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "�߸��� ���� �����Դϴ�"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "���� ��/��� �����Դϴ�"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "���� ���ð��� �ʰ��Ǿ����ϴ�"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "���� ȣ��Ʈ �ּҸ� �˻��� �� �����ϴ�"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "���� ȣ��Ʈ �̸��� �˻��� �� �����ϴ�"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "������ �����ϴµ� �����߽��ϴ�"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "������ ������ ������ �õ��ϴµ� �����߽��ϴ�"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "���� ���Ͽ� ��/��� ������ �߻��߽��ϴ�"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr ""
 "���� ������ ���� ���(passive mode)�� �����ϴ� ���� ������ �߻��߽��ϴ�"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "�������� ������ ã�� �� �����ϴ�"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "������ �ߴܵǾ����ϴ�"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "�� �� ���� Ȥ�� ����ġ ���� ������ �߻��߽��ϴ�"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "�� ������: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(���� ����)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "ġ���� ����: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "����: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "���: "
 
@@ -4127,44 +4090,79 @@ msgstr "���: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "�޸� �Ҵ� �� (%u ����Ʈ)�� NULL�� ��ȯ�Ͽ����ϴ�.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "URL ��Ʈ�� �ݵ�� �����̾�� �մϴ�\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s(��)�� �����ϴµ� ������: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "��Ű���� ������ �˻��մϴ�"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "���� �ɼ�:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ���µ� �����߽��ϴ�: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: �дµ� �����߽��ϴ�: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "RPM �б�(readRPM): %s(��)�� �н��ϴ�: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "������(final) ����� �ۼ��� �� �����ϴ�\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "�ӽ� ���� %s(��)�� �����ϴ� ���� ������ �߻��߽��ϴ�\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "�� RPM ������ ��Ű¡ ���� '1' �� �������� �ʽ��ϴ�\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "�� RPM ������ �� ��ȣ(major number)�� <= 4 �� ��Ű¡ ���� �����մϴ�\n"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: v1.0 RPM�� ������ �� �����ϴ�\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: v2.0 RPM�� ��-������ �� �����ϴ�\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: ��ȿ�� ������ �����ϴ� (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "%s ����: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "%s ������ %u ����Ʈ ���� �����ϴ�\n"
+
 #, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "%s-%s-%s�� ������ ���� �߻�: "
diff --git a/po/nb.po b/po/nb.po
index 6568f118b..3c3cb1f0b 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -10,52 +10,52 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "feil med avhengigheter under bygging:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Kunne ikke �pne tar-r�r: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Feil under lesing av spec-fil fra %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Feil under endring av navn fra %s til %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "kunne ikke kj�re stat p� %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Fil %s er ikke en vanlig fil.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Fil %s ser ikke ut til � v�re en spec-fil.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger m�lplattformene: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger for m�l %s\n"
@@ -75,164 +75,164 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr ""
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versjon %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "kun ett st�rre modi kan spesifiseres"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "uventede flagg for sp�rring"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "ventet sp�rringsformat"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "uventet sp�rringskilde"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenter til --prefix m� begynne med en /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -240,7 +240,7 @@ msgstr ""
 "skript som sl�r av alternativer kan kun spesifiseres under pakkeinstallasjon "
 "og sletting"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -248,125 +248,125 @@ msgstr ""
 "alternativer som sl�r av utl�sing  kan kun spesifiseres under "
 "pakkeinstallasjon, og sletting"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "ingen filer � signere\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke aksessere fil %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp ikke funnet: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Skriv inn passord: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Passordsjekk feilet\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Passord er ok.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "kj�ring feilet\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler oppgitt for ombygging"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "ingen spec-fil oppgitt for bygging"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "ingen tar-fil oppgitt for bygging"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "ingen argumenter oppgitt for sp�rring"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "ingen argumenter oppgitt for verifisering"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for sp�rring"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Kj�rer(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Kj�ring av %s feilet (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Ugyldig sluttstatus fra %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -425,92 +425,92 @@ msgstr "&& og || ikke st�ttet for strenger\n"
 msgid "syntax error in expression\n"
 msgstr "syntaksfeil i uttrykk\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIDSJEKK feil: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Mangler '(' i %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Mangler ')' i %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ugyldig %s-tegn: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Mangler '(' i %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "To filer p� �n linje: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Filen m� begynne med \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande spesiell %%doc med andre skjema: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil listet to ganger: %s\n"
@@ -540,7 +540,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead feilet\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -560,7 +560,7 @@ msgstr ""
 msgid "Glob not permitted: %s\n"
 msgstr "linje %d: Filnavn ikke tillatt: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
@@ -570,7 +570,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "Installerer %s\n"
@@ -580,7 +580,7 @@ msgstr "Installerer %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig eier/gruppe: %s\n"
@@ -602,185 +602,175 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "feil under oppretting av arkiv %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy skriving feilet: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: feil under lesing: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke �pne PreIn-fil: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke �pne PreUn-fil: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke �pne PostIn-fil: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke �pne PostUn-fil: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke �pne VerifyScript-fil: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr ""
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke en RPM-pakke\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: leser header fra %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "Kunne ikke skrive header til %s: %s\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke �pne %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke �pne sigm�l %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -790,32 +780,32 @@ msgstr ""
 msgid "line %d: second %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr ""
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr ""
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr ""
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr ""
@@ -825,17 +815,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linje %d: Ugyldig flagg %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -845,210 +835,210 @@ msgstr ""
 msgid "line %d: Second description\n"
 msgstr ""
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "linje %d: Feil under lesing av %%filer: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "%s-felt m� v�re tilstede i pakken: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Kunne ikke �pne ikon %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Kan ikke lese ikon %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Ukjent ikontype: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linje %d: Feilutformet tagg: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linje %d: Tom tagg: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linje %d: Ugyldig tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot kan ikke v�re \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linje %d: Docdir m� begynne med '/': %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linje %d: Epoch/serienummer m� v�re et tall: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linje %d: Ugyldig %s: kvalifikatorer: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linje %d: Ugyldig BuildArchitecture format: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern feil: Ugyldig tag %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ugyldig pakkespesifikasjon: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakke eksisterer allerede: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linje %d: Ukjent tagg: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec-fil kan ikke bruke BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Ingen patch-nummer %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Ingen kildenummer %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Kunne ikke laste ned ikke-kilde %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Feil under lesing av %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linje %d: Ugyldig argument til %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linje %d: Ugyldig %%setup flagg %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "linje %d: Trenger argument til %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "linje %d: Trenger argument til %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "linje %d: Ugyldig argument til %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "linje %d: Trenger argument til %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "linje %d: Ugyldig argument til %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "For mange patcher!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "linje %d: Ugyldig argument til %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linje %d: %%prep for andre gang\n"
@@ -1101,295 +1091,299 @@ msgstr "linje %d: Andre %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "linje %d: Feilutformet tagg: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linje %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan ikke �pne %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "�pen %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerer %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else uten %%if\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif uten %%if\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "ugyldig %%include utsagn\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen kompatible arkitekturer funnet for bygging\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakken har ingen %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "Feil under lesing av spec fil fra %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "bygg gjennom %prep (pakk ut kildekoden og legg til patcher) fra <specfil>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<specfil>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "bygg kilde- og bin�rpakker fra <specfil>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "sp�r pakke som eier <fil>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "bygg gjennom %prep (pakk ut kildekoden og legg til patcher) fra <tarball>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verifiser %files seksjon fra <tarball>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "bygg kilde- og bin�rpakker fra <tarball>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "bygg bin�r-pakke fra <kildepakke>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<kildepakke>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr ""
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "fjern byggtreet n�r ferdig"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "generer headere som er kompatible med rpm4 pakker"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr ""
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr ""
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 #, fuzzy
 msgid "do not verify build dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verifiser pakkesignatur"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr ""
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "fjern kildekoden n�r ferdig"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr ""
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "hopp rett til spesifisert steg (kun for c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "generer PGP/GPG signatur"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr ""
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke kj�re %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s feilet\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "kunne ikke skrive alle data til %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "feil under �pning av %s: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir av %s feilet: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s rmdir av %s feilet: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Klarte ikke � finne %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linje %d: Ugyldig nummer: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linje %d: Ugyldig no%s nummer: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linje %d: Ugyldig %s-nummer: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kan ikke sp�rre p� %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1435,77 +1429,77 @@ msgstr ""
 msgid " failed - "
 msgstr " feilet - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr ""
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr ""
 
@@ -1517,15 +1511,15 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr ""
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "hopp over PGP-signaturer"
@@ -1545,7 +1539,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr "feil under kj�ring av stat p� %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
@@ -1560,11 +1554,11 @@ msgstr "Fil %s: %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "fil %s er p� en ukjent enhet\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
@@ -1619,47 +1613,42 @@ msgstr "%s unlink av %s feilet: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s opprettet som %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr ""
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke opprette %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "feil under oppretting av midlertidig fil %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1714,184 +1703,175 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature feilet\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tilgjengelig\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead feilet\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr ""
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "skriv ut makroutvidelsen av <uttr>+"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "les <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "sl� av bruk av libio(3) API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "send stdout til <kmd>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "bruk <katalog> som toppniv�katalog"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "vis kjente tagger for sp�rring"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "vis endelig rpmrc og makrokonfigurasjon"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "gi mindre detaljert info"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "gi mer detaljert info"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "skriv ut hvilken versjon av rpm som brukes"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "feils�k rpmio I/U"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "feils�k URL-cache h�ndtering"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2330,7 +2310,7 @@ msgstr "ikke verifiser filer i pakke"
 msgid "don't verify files in package"
 msgstr "ikke verifiser filer i pakke"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
@@ -2376,99 +2356,99 @@ msgstr "signer en pakke (forkast n�v�rende signatur)"
 msgid "generate signature"
 msgstr "generer signatur"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, bin�r funnet\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: kj�rer %s-skript (hvis noen)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr ""
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ukorrekt format: %s\n"
@@ -2570,198 +2550,175 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: �pne feilet: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile feilet\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "argumentet er ikke en RPM-pakke\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: kan ikke signere v1.0 RPM\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Kan ikke signere v2.0 RPM p� nytt\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead feilet: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature feilet: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NEI"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "JA"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omplasser %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relokerer %s til %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relokerer katalog %s til %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under �pning av %s: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "linje %d: Ukjent tagg: %s\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "feilede avhengigheter:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Forbereder..."
@@ -2789,105 +2746,120 @@ msgstr "Forbereder..."
 msgid "Upgrading packages..."
 msgstr "oppgrader pakke(r)"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Henter %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hopper over %s - overf�ring feilet - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<kildepakke>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installerer bin�rpakker\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "feil under lesing fra fil %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "fil %s trenger en nyere versjon av RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "ingen pakke utl�ser %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d bin�rpakker\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "installerer bin�rpakker\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke �pne %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Henter %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "argumentet er ikke en RPM-pakke\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Ingen signatur tilgjengelig\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "lesing feilet: %s (%d)\n"
@@ -2933,601 +2905,605 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- ikke st�ttet for strenger\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "pakke %s er for en annen arkitektur"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "pakke %s er for et annet operativsystem"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakke %s er allerede installert"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "sti %s i pakke %s kan ikke relokeres"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " kreves av %s-%s-%s\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "ikke installert"
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " er i konflikt med %s-%s-%s\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "mangler andre ':' ved %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manglende navn p� arkitektur ved %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ukomplett datalinje ved %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "For mange argumenter i datalinje ved %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ukomplett standardlinje ved %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "mangler ':' (fant 0x%02X) ved %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manglende argumentfor %s ved %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan ikke �pne %s ved %s:%d %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manglende arkitektur for %s ved %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ugyldig flagg '%s' ved %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan ikke utvide %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke �pne pakkedatabase i %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Mangler '(' i %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "kan ikke �pne database i %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Henter %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "henter liste over monterte filsystemer\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "Fil %s: %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "relokerer %s til %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke kj�re %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr ""
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "kj�ring feilet\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "For stor header"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "ikke verifiser header SHA1 digest"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "hopp over MD5-signaturer"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "hopp over MD5-signaturer"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "kildepakke forventet, bin�r funnet\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "ingen pakke utl�ser %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<kildepakke>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<kildepakke>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "feil under lesing av header fra pakke\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "mangler    %s"
@@ -3536,60 +3512,60 @@ msgstr "mangler    %s"
 msgid "Unknown system error"
 msgstr ""
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
@@ -3614,76 +3590,76 @@ msgstr ""
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "mangler { etter %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "mangler } etter %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr ""
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3704,383 +3680,369 @@ msgstr "gjenoppbygg database inverterte lister fra installerte pakkers headere"
 msgid "verify database files"
 msgstr ""
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan ikke �pne %s-indeks ved bruk av db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan ikke �pne %s indeks\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, c-format
 msgid "closed   sql db         %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr ""
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Overflyt i m�lbuffer\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Fil %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Fil %s er mindre enn %u bytes\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- ikke st�ttet for strenger\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- ikke st�ttet for strenger\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "lesing feilet: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr ""
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "fatal feil: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "feil: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "advarsel: "
 
@@ -4089,43 +4051,67 @@ msgstr "advarsel: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url-port m� v�re et tall\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "verifiser pakkesignatur"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: �pne feilet: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
 
 #, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Kunne ikke skrive header til %s: %s\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "feil under oppretting av midlertidig fil %s\n"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: kan ikke signere v1.0 RPM\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Kan ikke signere v2.0 RPM p� nytt\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Fil %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Fil %s er mindre enn %u bytes\n"
+
+#, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "feilede avhengigheter:\n"
diff --git a/po/pl.po b/po/pl.po
index 83e509863..1ca3cd028 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2007-08-29 13:48+0200\n"
 "Last-Translator: Piotr Drąg <raven@pmail.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,51 +17,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Niespełnione zależności budowania:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nie można otworzyć pliku spec %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Otwarcie potoku tara nie powiodło się: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Odczytanie pliku spec z %s nie powiodło się\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Zmiana nazwy %s na %s nie powiodła się: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "stat nie powiodło się %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Plik %s nie jest zwykłym plikiem.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Plik %s nie wygląda na plik spec.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Budowanie dla platform: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
@@ -81,58 +81,58 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Opcje zapytania (z -q lub --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Opcje sprawdzania (z -V lub --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr "Opcje źródła (z --query lub --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr "Opcje przejścia tree plików (z --ftswalk):"
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Opcje podpisu:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Opcje bazy danych:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opcje budowania z [ <plik spec> | <tarball> | <pakiet źródłowy> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opcje instalowania/aktualizowania/usuwania:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Wspólne opcje dla wszystkich trybów i binariów rpm:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM wersja %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -140,109 +140,109 @@ msgstr ""
 "Ten program może być swobodnie rozpowszechniany na warunkach licencji GNU "
 "GPL\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Wewnętrzny błąd w przetwarzaniu argumentu (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "może być podany tylko jeden główny tryb pracy"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "nieoczekiwane flagi zapytania"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "nieoczekiwany format zapytania"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "nieoczekiwane źródło zapytania"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "tylko instalację, aktualizowanie i usuwanie źródeł oraz plików spec można "
 "wymusić"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "przesuwania plików można dokonać tylko podczas instalacji"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "nie można użyć --prefix z --relocate lub --excludepath"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate i --excludepath można użyć tylko podczas instalacji nowych "
 "pakietów"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix można użyć tylko podczas instalowania nowych pakietów"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty dla --prefix muszą rozpoczynać się od /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie można jednocześnie użyć --excludedocs i --includedocs"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches można użyć tylko podczas usuwania pakietów"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles można użyć tylko podczas instalacji pakietów"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb można użyć tylko podczas instalacji lub usuwania pakietów"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -250,7 +250,7 @@ msgstr ""
 "opcje wyłączające skrypty można użyć tylko podczas instalacji lub usuwania "
 "pakietów"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -258,7 +258,7 @@ msgstr ""
 "opcje wyłączające triggery można użyć tylko podczas instalacji lub usuwania "
 "pakietów"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -266,14 +266,14 @@ msgstr ""
 "--nodeps można użyć tylko podczas budowania, przebudowywania, ponownej "
 "kompilacji, instalacji, usuwania lub sprawdzania pakietów"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test można użyć tylko podczas instalacji, usuwania lub budowania pakietów"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -281,105 +281,105 @@ msgstr ""
 "--root (-r) można użyć tylko podczas instalacji, usuwania, sprawdzania "
 "pakietów lub przebudowywania bazy"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty dla --root (-r) muszą rozpoczynać się od /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "brak plików do podpisania\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "brak dostępu do pliku %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "nie znaleziono pgp: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Podaj długie hasło: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Sprawdzanie długiego hasła nie powiodło się\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Długie hasło jest dobre.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Nieprawidłowa specyfikacja %%_signature w pliku makra.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign można użyć tylko podczas budowania pakietu"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "wykonanie nie powiodło się\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakietów do przebudowania"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "nie podano nazw plików spec do budowania"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "nie podano plików tar do zbudowania"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "nie podano pakietów do usunięcia"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "nie podano pakietów do zainstalowania"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "nie podano argumentów dla zapytania"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "nie podano argumentów dla sprawdzania"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "nie podano argumentów"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Nie można otworzyć pliku tymczasowego.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Wykonywanie(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Wykonanie %s nie powiodło się (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Błędny stan wyjścia z %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -438,92 +438,92 @@ msgstr "&& i || nie są obsługiwane dla łańcuchów znakowych\n"
 msgid "syntax error in expression\n"
 msgstr "błąd składni w wyrażeniu\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK nie powiodło się: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Brak \"(\" w %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Brak \")\" w %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Nieprawidłowy znak %s: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Brak %s w %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Brak białego znaku po %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Błąd składni: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Błędny tryb spec: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Błędny tryb katalogu spec: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Niespotykana długość określenia lokalizacji \"%.*s\" w %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Powtórzone określenie lokalizacji %.*s w %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limit trafień dla %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Tylko jeden argument dla %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dwa pliki w jednym wierszu: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Plik musi zaczynać się od \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie można mieszać specjalnego %%doc z innymi formami: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr "nieprawidłowe _docdir_fmt: %s\n"
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Plik podany dwukrotnie: %s\n"
@@ -553,7 +553,7 @@ msgstr "%s: nie można wczytać nieznanego znacznika (%d).\n"
 msgid "%s: public key read failed.\n"
 msgstr "%s: odczyt klucza publicznego nie powiódł się.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: nie jest opakowanym kluczem publicznym.\n"
@@ -573,7 +573,7 @@ msgstr "Plik musi zaczynać się od \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob jest niedozwolony: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Nie znaleziono pliku poprzez glob: %s\n"
@@ -583,7 +583,7 @@ msgstr "Nie znaleziono pliku poprzez glob: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nie można otworzyć pliku %s dla %%files: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "wiersz: %s\n"
@@ -593,7 +593,7 @@ msgstr "wiersz: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Błędny plik: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Błędny użytkownik/grupa: %s\n"
@@ -617,181 +617,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plików: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: za dużo UID-ów\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: za dużo UID-ów\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: za dużo UID-ów\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: za dużo GID-ów\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: za dużo GID-ów\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: za dużo GID-ów\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nie można rozwiązać nazwy komputera: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "utworzenie archiwum nie powiodło się na pliku %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "utworzenie archiwum nie powiodło się: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "zapis w trybie cpio_copy nie powiódł się: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "odczyt w trybie cpio_copy nie powiódł się: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nie można otworzyć pliku PreIn: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nie można otworzyć pliku PreUn: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nie można otworzyć pliku PostIn: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nie można otworzyć pliku PostUn: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nie można otworzyć pliku VerifyScript: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nie można otworzyć skryptu Trigger: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otwórz %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: odczytaj %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek nie powiodło się: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie jest pakietem RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: odczytywanie nagłówka z %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie można utworzyć niezmiennej części nagłówka.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "Nie można zapisać tymczasowego nagłówka\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Błędne dane CSA\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Nie można zapisać ostatecznego nagłówka\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Tworzenie podpisu: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Nie można ponownie wczytać nagłówka podpisu.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nie można otworzyć %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie można zapisać pakietu: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie można otworzyć nagłówka do zapisania podpisu %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie można odczytać nagłówka z %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie można zapisać nagłówka do %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie można odczytać danych z %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie można zapisać danych do %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie można utworzyć wyjściowej nazwy dla pakietu %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie można utworzyć %s: %s\n"
@@ -801,32 +792,32 @@ msgstr "nie można utworzyć %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "wiersz %d: druga %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "wpisy %%changelog muszą zaczynać się od *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "niekompletny wpis %%changelog\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "błędna data w %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "wpisy w %%changelog są ułożone niechronologicznie\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "brak nazwy w %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "brak opisu w %%changelog\n"
@@ -836,17 +827,17 @@ msgstr "brak opisu w %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "wiersz %d: błąd podczas analizowania %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "wiersz %d: błędna opcja %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "wiersz %d: za dużo nazw: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "wiersz %d: Ppakiet nie istnieje: %s\n"
@@ -856,210 +847,210 @@ msgstr "wiersz %d: Ppakiet nie istnieje: %s\n"
 msgid "line %d: Second description\n"
 msgstr "wiersz %d: drugi opis\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "wiersz %d: błąd podczas analizowania %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "wiersz %d: druga lista %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architektura jest wykluczona: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architektura nie jest dołączona: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS jest wykluczony: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS nie jest dołączony: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "pole %s musi być obecne w pakiecie: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Podwójne wpisy %s w pakiecie: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Nie można otworzyć ikony %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Nie można odczytać ikony %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Nieznany typ ikony: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "wiersz %d: etykieta przyjmuje tylko jeden znacznik: %s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "wiersz %d: niesformowany znacznik: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "wiersz %d: pusty znacznik: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "wiersz %d: niedozwolony znak \"-\" w %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot nie może być \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "wiersz %d: Docdir musi zaczynać się od \"/\": %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "wiersz %d: pole Epoch/Serial musi być liczbą: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "wiersz %d: błędne określenia %s: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "wiersz %d: błędny format BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Wewnętrzny błąd: fałszywy znacznik %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr "Przestarzała składnia nie jest wspierana: %s\n"
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Błędna specyfikacja pakietu: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakiet już istnieje: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "wiersz %d: nieznany znacznik: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Plik spec nie może używać BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Błędne źródło: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Brak łaty numer %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Brak źródła numer %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Nie można pobrać pliku nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Błąd podczas analizowania %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "wiersz %d: błędny argument dla %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "wiersz %d: błędna opcja %%setup %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "wiersz %d: wymagany argument dla %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "wiersz %d: wymagany argument dla %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "wiersz %d: błędny argument dla %%patch -F: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "wiersz %d: wymagany argument dla %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "wiersz %d: błędny argument dla %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Za dużo łat!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "wiersz %d: błędny argument dla %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "wiersz %d: drugie %%prep\n"
@@ -1112,291 +1103,295 @@ msgstr "wiersz %d: drugi %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "wiersz %d: nieobsługiwany wewnętrzny skrypt: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "wiersz %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nie można otworzyć %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Niedomknięte %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean zwróciło %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: napotkano %%else bez %%if\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: napotkano %%endif bez %%if\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "niesformowany wpis %%include\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Nie znaleziono kompatybilnych architektur do budowania\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakiet nie ma %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot był już wcześniej podany, ignorowanie %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "zbuduj przez %prep (rozpakuj źródła i nałóż łaty) z <pliku spec>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<plik spec>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "zbuduj przez %build (%prep oraz kompilacja) z <pliku spec>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "zbuduj przez %install (%prep, %build oraz instalacja) z <pliku spec>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "sprawdź sekcję %files z <pliku spec>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "zbuduj pakiet źródłowy i binarny z <pliku spec>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "zbuduj tylko pakiet binarny z <pliku spec>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "zbuduj tylko pakiet źródłowy z <pliku spec>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "zbuduj przez %prep (rozpakuj źródła i nałóż łaty) z <tarballa>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "zbuduj przez %build (%prep oraz kompilacja) z <tarballa>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "zbuduj przez %install (%prep, %build oraz instalacja) z <tarballa>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "sprawdź sekcję %files z <tarballa>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "zbuduj pakiet źródłowy i binarny z <tarballa>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "zbuduj tylko pakiet binarny z <tarballa>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "zbuduj tylko pakiet źródłowy z <tarballa>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "zbuduj pakiet binarny z <pakietu źródłowego>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<pakiet źródłowy>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "zbuduj przez %install (%prep, %build oraz instalacja) z <pakietu źródłowego>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "zastąp build root"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "usuń drzewo budowania po zakończeniu"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "utwórz nagłówki kompatybilne z pakietami rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "zignoruj dyrektywy ExcludeArch: z pliku spec"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "debuguj maszynę stanów plików"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "nie wykonaj żadnych etapów budowania"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "nie sprawdzaj zależności budowania pakietu"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "utwórz nagłówki pakietu kompatybilne z (przestarzałymi) pakietami rpm[23]"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "nie sprawdzaj skrótów pakietu"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "nie sprawdzaj nagłówków bazy danych po otrzymaniu"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "nie sprawdzaj podpisów pakietu"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "nie akceptuj wpisów msgstr i18n z pliku spec"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "usuń źródła po zakończeniu"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "usuń plik spec po zakończeniu"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "przejdź od razu do podanego etapu (tylko dla c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "utwórz podpis PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "zastąp platformę docelową"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "wyszukaj wpisy i18n w katalogu pliku spec"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "utwórz nagłówki kompatybilne z (przestarzałymi) pakietami rpm[23]"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr "\texecv(%s) PID %d\n"
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie można wykonać %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie można rozdzielić %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr "\twaitpid(%d) rc %d stan %x\n"
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s nie powiodło się\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "zapisanie wszystkich danych do %s nie powiodło się\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) nie powiodło się: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load(ms, \"%s\") nie powiodło się: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "magic_file(ms, \"%s\") nie powiodło się: tryb %06o %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Wyszukiwanie %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Wyszukanie %s nie powiodło się:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "wiersz %d: błędny numer: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "wiersz %d: błędny numer no%s: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "wiersz %d: błędny numer %s: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "nie można odpytać %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "odpytywanie pliku spec %s nie powiodło się, nie można zanalizować\n"
@@ -1442,52 +1437,52 @@ msgstr "Brak pliku archiwum w nagłówku"
 msgid " failed - "
 msgstr " nie powiodło się -"
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "pakiet %s został już dodany, pomijanie %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakiet %s został już dodany, zastępowanie pakietem %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr "  Zastępuje: %s\t\terases %s\n"
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(zapisane w pamięci podręcznej)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(zasób rpmlib)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(pliki w bazie)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(zasób w bazie)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "zignoruj relacje nazw pakietów [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "usuwanie %s \"%s\" z relacji tsort.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== zapisywanie relacji tsort\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
@@ -1495,26 +1490,26 @@ msgstr ""
 "========== tsortowanie pakietów (kolejność, #poprzedniki, #następniki, "
 "drzewo, głębokość, szerokość)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== tylko następniki (%d bajtów)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "PĘTLA:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== kontynuowanie tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder nie powiodło się, zostało %d elementów\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(nie jest liczbą)"
 
@@ -1526,15 +1521,15 @@ msgstr "(nie jest base64)"
 msgid "(invalid type)"
 msgstr "(nieprawidłowy typ)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(nie jest blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(nieprawidłowy typ XML)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(nie jest podpisem OpenPGP)"
 
@@ -1553,7 +1548,7 @@ msgstr "mntctl() nie zwróciło punktów montowania: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "stat %s nie powiodło się: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "otwarcie %s nie powiodło się: %s\n"
@@ -1568,11 +1563,11 @@ msgstr "%5d 0x%04x %s %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "plik %s jest na nieznanym urządzeniu\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== Katalogi nie włączone w bezpośredni sposób do pakietu:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1627,47 +1622,42 @@ msgstr "%s unlink %s nie powiodło się: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s utworzony jako %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "dodawanie %d argumentów z manifestu.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie można utworzyć %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie można zapisać do %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "błąd podczas tworzenia pliku tymczasowego %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "rozmiar blob(%d): BŁĘDNY, 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "znacznik[%d]: BŁĘDNY, znacznik %d typ %d offset %d licznik %d\n"
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr "offset obszaru: BŁĘDNY, znacznik %d typ %d offset %d licznik %d\n"
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr "końcówka obszaru: BŁĘDNA, znacznik %d typ %d offset %d licznik %d\n"
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "rozmiar obszaru: BŁĘDNY, ril(%d) > il(%d)\n"
@@ -1722,180 +1712,178 @@ msgstr "hdr blob(%d): BŁĘDNY, read zwróciło %d\n"
 msgid "hdr load: BAD\n"
 msgstr "hdr load: BŁĘDNY\n"
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "pakiety w wersji 1 nie są obsługiwane przez tę wersję RPM-a\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"tylko pakiety z numerem głównym <= 4 są obsługiwane przez tę wersję RPM-a\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature nie powiodło się: %s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: podpis jest niedostępny\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead nie powiodło się: %s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr "pomijanie pakietu %s z podpisem V%u, którego nie można sprawdzić\n"
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread nie powiodło się: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s jest RPM-em Delta i nie może zostać bezpośrednio zainstalowany\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nieobsługiwany rozmiar (%s) w pakiecie %s\n"
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+#, fuzzy
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "FTS_COMFOLLOW: podążaj za dowiązaniami z wiersza poleceń"
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+#, fuzzy
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "FTS_LOGICAL: przechodź logicznie"
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+#, fuzzy
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "FTS_NOCHDIR: nie zmień katalogów"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+#, fuzzy
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "FTS_NOSTAT: nie uzyskaj informacji stat"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+#, fuzzy
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "FTS_PHYSICAL: przechodź fizycznie"
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+#, fuzzy
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "FTS_SEEDOT: zwracaj kropkę i kropkę-kropkę"
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+#, fuzzy
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "FTS_XDEV: nie przechodź między urządzeniami"
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+#, fuzzy
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "FTS_WHITEOUT: zwróć informacje o whiteout"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "wcześniej określ MAKRO z wartością WYR"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "\"MAKRO WYR\""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "określ MAKRO z wartością WYR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "wyświetl rozwinięcie makr z WYR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "\"WYR\""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "odczytaj <PLIK:...> zamiast domyślnych plików"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<PLIK:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "wyłącz używanie API libio(3)"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "przekaż standardowe wyjście do POLECENIA"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "POLECENIE"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "użyj ROOT jako katalogu najwyższego poziomu"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "wyświetl znane znaczniki zapytań"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "wyświetl ostateczną konfigurację rpmrc i makr"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "używaj mniej szczegółowego wyjścia"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "używaj bardziej szczegółowego wyjścia"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "wyświetl wersję używanego RPM-a"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "debuguj maszynę stanu danych pliku"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr "użyj wątków dla maszyny stanu plików"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "debuguj przetwarzanie opcji/argumentów"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "debuguj maszynę stanu pakietu"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr "użyj wątków dla maszyny stanu pakietów"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "debuguj wejście/wyjście rpmio"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "debuguj obsługę pamięci podręcznej URL-i"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabela opcji jest błędnie skonfigurowana (%d)\n"
@@ -2317,7 +2305,7 @@ msgstr "nie sprawdzaj kontekstów bezpieczeństwa plików"
 msgid "don't verify files in package"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "nie sprawdzaj zależności pakietu"
 
@@ -2357,98 +2345,98 @@ msgstr "podpisz pakiety (identyczne z --addsign)"
 msgid "generate signature"
 msgstr "utwórz podpis"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "spodziewany był pakiet źródłowy, znaleziono binarny\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "pakiet źródłowy nie zawiera pliku .spec\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rc %d stan %x sekundy %u.%03u\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s.%s) uruchamianie skryptu <lua>.\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s.%s) pomijanie nadmiarowego \"%s\".\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s.%s) %ssynchroniczne uruchomienie skryptu\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) PID %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "skrypt %s(%s-%s-%s.%s) nie powiódł się, waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "skrypt %s(%s-%s-%s.%s) nie powiódł się, sygnał %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "skrypt %s(%s-%s-%s.%s) nie powiódł się, stan wyjścia %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s ma %d plików, test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: skrypt %s nie powiódł się (%d), pomijanie %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "Nie można ponownie wczytać nagłówka podpisu\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozpakowanie archiwum nie powiodło się%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s nie powiódł się na pliku %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiodło się: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr "Próba oznakowania %s jako zainstalowanego w tablicy punktów(%p).\n"
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr "Próba oznakowania %s jako usuniętego w tablicy punktów(%p).\n"
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "niepoprawny format: %s\n"
@@ -2549,126 +2537,107 @@ msgstr "numer rekordu pakietu: %u\n"
 msgid "record %u could not be read\n"
 msgstr "nie można odczytać rekordu %u\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(dodane pliki)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(dodany zasób)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otwarcie nie powiodło się: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile nie powiodło się\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite nie powiodło się: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fflush nie powiodło się: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: nie jest pakietem RPM\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: nie można podpisać pakietu v1\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: nie można ponownie podpisać pakietu v2\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: już był podpisany kluczem o ID %s, pomijanie\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead nie powiodło się: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature nie powiodło się: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: zaimportowanie read nie powiodło się(%d).\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: zaimportowanie nie powiodło się.\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead nie powiodło się\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry nie powiodło się\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: podpis nie jest dostępny (RPM v1.0)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NIE "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "TAK"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2677,71 +2646,67 @@ msgstr ""
 "Zależność \"B\" wymaga epoch (przyjęto takie samo epoch jak \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakiet %s ma niespełnione %s: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominięty z powodu flagi missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== przesunięcia\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d wyłączenie  %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d przesunięcie %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "wyłączanie %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie katalogu %s do %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiodło się: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "nieznany znacznik: \"%s\"\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Niespełnione zależności:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    Sugerowane sposoby spełnienia:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
@@ -2766,105 +2731,120 @@ msgstr "Aktualizowanie..."
 msgid "Upgrading packages..."
 msgstr "Aktualizowanie pakietów..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "Dodawanie celu: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pobieranie %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr "... jako %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "pomijanie %s - transmisja nie powiodła się - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie może zostać zainstalowany\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "\tdodano pakiet źródłowy [%d]\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "\tdodano pakiet binarny [%d]\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "błąd podczas odczytywania z pliku %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "plik %s wymaga nowszej wersji RPM-a\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: nie jest pakietem RPM (ani manifestem pakietu): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "instalowanie pakietów binarnych\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie można otworzyć pliku %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" określa wiele pakietów\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie można otworzyć %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalowanie %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Cofnij pakiety (+%d/-%d) do %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "Czyszczenie ponownie spakowanych pakietów:\n"
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\tUsuwanie %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: nie jest pakietem RPM\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: podpis jest niedostępny\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "odczytanie nie powiodło się: %s (%d)\n"
@@ -2910,601 +2890,605 @@ msgstr "skrypty pakietu mogą odwoływać się do bazy RPM-a podczas instalowani
 msgid "internal support for lua scripts."
 msgstr "wewnętrzna obsługa skryptów lua."
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "nie można utworzyć blokady transakcji na %s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "oczekiwanie na blokadę transakcji na %s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "różne"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "pakiet %s jest przeznaczony dla architektury %s"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "pakiet %s jest przeznaczony dla systemu operacyjnego %s"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakiet %s jest już zainstalowany"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "ścieżka %s w pakiecie %s nie jest przesuwalna"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "plik %s jest w konflikcie między instalowanymi pakietami %s i %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "plik %s z instalacji %s jest w konflikcie z plikiem z pakietu %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "pakiet %s (nowszy niż %s) jest już zainstalowany"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "instalowanie pakietu %s wymaga %ld%cB w systemie plików %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalowanie pakietu %s wymaga %ld i-węzłów w systemie plików %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s jest wymagany przez %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(zainstalowany) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s jest w konflikcie z %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "wystąpił nieznany błąd %d podczas manipulowania pakietem %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "brak drugiego \":\" w %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "brak nazwy architektury w %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Niekompletny wiersz danych w %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Za dużo argumentów w wierszu danych w %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Błędny numer architektury/systemu operacyjnego: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Niekompletny domyślny wiersz w %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Za dużo argumentów w domyślnym wierszu w %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Odczytanie %s nie powiodło się: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "brak \":\" (znaleziono 0x%02x) w %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "brak argumentu dla %s w %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "rozwinięcie %s nie powiodło się w %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nie można otworzyć %s w %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "brak architektury dla %s w %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "błędna opcja \"%s\" w %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Nieznany system: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr "Skontaktuj się z %s\n"
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Nie można rozwinąć %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Nie można odczytać %s, HOME jest za duże.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie można otworzyć %s do odczytania: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie można otworzyć bazy Packages w %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "dodatkowe \"(\" w etykiecie pakietu: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "brak \"(\" w etykiecie pakietu: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "brak \")\" w etykiecie pakietu: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "nie można otworzyć bazy Solve w %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Dodawane: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Sugerowane: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    Sugerowane sposoby spełnienia:\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "zamontowane systemy plików:\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 "    i        urządzenie    rozmiarbloku       dostępnychbloków       "
 "dostępnychi-węzłów punkt montowania\n"
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%08x %8u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr "Tworzenie tablicy wyników transakcji(%p, %p)\n"
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr "\tAdres tablicy wyników:  %p\n"
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\tPrzydzielanie przestrzeni na %d wpisów\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr "\tDodawanie wpisu dla %s do tablicy wyników.\n"
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr "\t\tAdres wpisu:  %p\n"
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr "\tAktualizowanie wpisu dla %s w tablicy wyników.\n"
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr "Można uwolnić tablicę wyników(%p)\n"
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr "\tLicznik odniesień wynosi zero... Zostanie uwolniona\n"
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr "Wyszukiwanie w tablicy wyników(%p) %s\n"
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr "\tZnaleziono wpis pod adresem:  %p\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 "Oczekiwany rozmiar: %12d = nagłówek(%d)+podpisy(%d)+wyrównanie(%d)+dane(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktyczny rozmiar: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "sigh rozmiar(%d): BŁĘDNY, read zwróciło %d\n"
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr "sigh magic: BŁĘDNY\n"
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr "sigh znaczników: BŁĘDNE, liczba znaczników(%d) spoza zakresu\n"
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr "sigh dane: BŁĘDNE, liczba bajtów(%d) spoza zakresu\n"
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr "sigh blob(%d): BŁĘDNY, read zwróciło %d\n"
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "sigh znacznik[%d]: BŁĘDNA, znacznik %d typ %d offset %d licznik %d\n"
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr "sigh wczytanie: BŁĘDNE\n"
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr "sigh wyrównanie(%d): BŁĘDNE, odczytano %d bajtów\n"
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr "sigh rozmiar podpisu(%d): BŁĘDNY, fstat(2) nie powiodło się\n"
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Podpis: rozmiar(%d)+wyrównanie(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie można wykonać %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp nie powiodło się\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "zapisanie podpisu przez pgp nie powiodło się\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Rozmiar podpisu PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "nie można odczytać podpisu\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Otrzymano %d bajtów podpisu PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "wykonanie gpg nie powiodło się (%d)\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "zapisanie podpisu przez gpg nie powiodło się\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Rozmiar podpisu GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Otrzymano %d bajtów podpisu GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Nieprawidłowa specyfikacja %%_signature w pliku makr\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musisz ustawić \"%%_gpg_name\" w pliku makr\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musisz ustawić \"%%_pgp_name\" w pliku makr\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "Rozmiar nagłówka+danych: "
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "Skrót MD5: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "Skrót SHA1 nagłówka: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Nagłówek "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 msgid " signature: "
 msgstr " podpis: "
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr " Podpis DSA: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Sprawdź podpis: BŁĘDNE PARAMETRY\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Uszkodzony skrót MD5: NIE OBSŁUGIWANY\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpis: NIEZNANY (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "wyłączanie katalogu %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr "Transakcja nie powiodła się... Cofanie zmian\n"
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr "Nie można uporządkować transakcji automatycznego cofania zmian!\n"
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr "Otrzymywanie ponownie spakowanego nagłówka z elementu transakcji\n"
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\tWyszukiwanie %s...\n"
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr "\tZnaleziono pasujące.\n"
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr "\tNie znaleziono pasujących.\n"
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr "\tNie znaleziono ponownie spakowanego pakietu!.\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr "\tREMOVETID pasuje do INSTALLTID.\n"
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\tNazwa:  %s.\n"
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\tPonownie spakowany pakiet był %s...\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 "Dodawanie zainstalowanego elementu do transakcji automatycznego cofania "
 "zmian.\n"
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr "Nie można otrzymać zainstalowanego elementu instancji bazy danych!\n"
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 "Nie można otrzymać nagłówka dla transakcji automatycznego cofania zmian!\n"
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\tDodano ponownie spakowany nagłówek pakietu: %s.\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr "\tDodano z zainstalowanego elementu %s.\n"
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr "\tDodano usunięty element.\n"
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 "Nie można otrzymać ponownie spakowanego nagłówka dla transakcji "
 "automatycznego cofania zmian!\n"
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr "Dodaj usunięty element do automatycznego cofania zmian.\n"
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr "\tZnaleziono istniejący zaktualizowany element.\n"
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr "\tUsunięty element nie zostanie dodany do %s.\n"
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\tDodano ponownie spakowany pakiet %s.\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\tDodano usunięty element %s.\n"
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr "Nie można dodać usuniętego elementu do automatycznego cofania zmian.\n"
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr "\tBrak ponownie spakowanego pakietu... Nie ma nic do zrobienia.\n"
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr "Odczytanie ponownie spakowanego pakietu nie powiodło się!\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "sprawdzanie poprawności %d elementów\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr "uruchamianie skryptów przedtransakcyjnych\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "obliczanie %d odcisków plików\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "obliczanie dyspozycji plików\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr "Tworzenie transakcji automatycznego cofania zmian\n"
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr "Dodanie nie powiodło się. Nie można odczytać nagłówka pakietu.\n"
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "Dodanie nie powiodło się w rpmpsmStage().\n"
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr "Dodanie nie powiodło się. Nie można otrzymać listy plików.\n"
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "Usuwanie nie powiodło się w rpmpsmStage().\n"
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr "uruchamianie skryptów potransakcyjnych\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr "brak   %c %s"
@@ -3513,60 +3497,60 @@ msgstr "brak   %c %s"
 msgid "Unknown system error"
 msgstr "Nieznany błąd systemu"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "błąd db%d(%d) z %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "błąd db%d(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "zamknięto   środowisko bazy danych %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "usunięto  środowisko bazy danych %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "otwieranie  środowiska bazy danych %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "zamknięto   indeks bazy danych       %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "sprawdzono indeks bazy danych       %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "otwieranie  indeksu bazy danych       %s/%s %s tryb=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nie można otrzymać blokady %s na %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "wyłącznej"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "współdzielonej"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "zablokowano   indeks bzy danych       %s/%s\n"
@@ -3591,76 +3575,76 @@ msgstr "%s ma za dużą lub za małą wartość long, pominięto\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s ma za dużą lub za małą wartość całkowitą, pominięto\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "brak { po %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "brak } po %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "pusty format znacznika"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "pusta nazwa znacznika"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "nieznany znacznik"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "spodziewany jest ] na końcu tablicy"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "nie spodziewany ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "nie spodziewany }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "spodziewany jest ? w wyrażeniu"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "spodziewany jest { po ? w wyrażeniu"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "spodziewany jest } w wyrażeniu"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "spodziewany jest : po podwyrażeniu ?"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "spodziewany jest { po : w wyrażeniu"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "spodziewany jest | na końcu wyrażenia"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(indeks spoza zakresu)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "iterator tablicy użyty na tablicach o różnych rozmiarach"
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
@@ -3682,385 +3666,371 @@ msgstr ""
 msgid "verify database files"
 msgstr "sprawdź pliki bazy danych"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "utwórz nagłówki kompatybilne z (przestarzałymi) pakietami rpm[23]"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nierozpoznana nazwa znacznika: \"%s\" zignorowana\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, 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"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "nie można otworzyć indeksu %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "ścieżka bazy danych nie została ustawiona\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "błąd(%d) podczas otrzymywania rekordów \"%s\" z indeksu %s\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: pomijanie"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "błąd(%d) podczas zapisywania rekordu #%d do %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: pomijanie"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: uszkodzony nagłówek #%u został odtworzony - pomijanie.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: nie można odczytać nagłówka pod 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "błąd(%d) podczas ustawiania rekordu nagłówka #%d do usunięcia %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie \"%s\" z indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "usuwanie %d wpisów z indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "błąd(%d) podczas ustawiania rekordów \"%s\" z indeksu %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "błąd(%d) podczas zapisywania rekordu \"%s\" do %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "błąd(%d) usuwania rekordu \"%s\" z %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "błąd(%d) podczas przydzielania nowej instancji pakietu\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: pomijanie"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodawanie \"%s\" do indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodawanie %d wpisów do indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "błąd(%d) podczas zapisywania rekordu %s do %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "usuwanie %s po udanym przebudowaniu db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "ścieżka bazy danych nie została ustawiona"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "przebudowywanie bazy danych %s w %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tymczasowa baza danych %s już istnieje\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "tworzenie katalogu %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych za pomocą dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych za pomocą dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "nagłówek #%u w bazie danych jest błędny - pomijanie.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie można dodać rekordu będącego oryginalnie przy %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 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"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy danych na nową nie powiodła się!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "aby odzyskać należy zastąpić pliki w %s plikami z %s"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "usuwanie katalogu %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr "Nie można zablokować bazy danych %s, ponawianie... (%d)\n"
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, c-format
 msgid "closed   sql db         %s\n"
 msgstr "zamknięto   bazę danych SQL         %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "otwieranie  bazy danych SQL         %s (%s) tryb=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktywny %d pusty %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(pusty)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(pusty)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Przepełnienie bufora docelowego\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s ma nie zakończone ciało\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s ma niedozwoloną nazwę (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s ma nie zakończone opcje\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s ma puste ciało\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Rozwinięcie makra %%%s nie powiodło się\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s ma niedozwoloną nazwę (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) nie było użyte poniżej poziomu %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nieznana opcja %c w %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Głębokość rekursji(%d) większa niż maksymalna(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Niezakończone %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Napotkano makro nie do przeanalizowania po %%\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Nie znaleziono makra %%%.*s, pomijanie\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Plik %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Plik %s jest mniejszy niż %u bajtów\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "nieprawidłowa składnia skryptu lua: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "nieprawidłowa składnia skryptu lua: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "skrypt lua nie powiódł się: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "nieprawidłowa składnia pliku lua: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "hak lua nie powiódł się: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Sukces"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Błędna odpowiedź serwera"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Błąd wejścia/wyjścia serwera"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Przekroczono limit czasu oczekiwania serwera"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Nie można znaleźć adresu hosta serwera"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Nie można znaleźć nazwy hosta serwera"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Połączenie z serwerem nie powiodło się"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Ustanowienie połączenia danych do serwera nie powiodło się"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Błąd wejścia/wyjścia na lokalnym pliku"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Błąd: ustawienie zdalnego serwera w tryb pasywny nie powiodło się"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Plik nie został znaleziony na serwerze"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Przerywanie"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Nieznany lub nieoczekiwany błąd"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "odczytanie nie powiodło się: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(brak błędu)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "fatalny błąd: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "błąd: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "ostrzeżenie: "
 
@@ -4069,42 +4039,76 @@ msgstr "ostrzeżenie: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "przydzielenie pamięci (%u bajtów) zwróciło NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "port URL-a musi być liczbą\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiodło się: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "nie sprawdzaj podpisu nagłówka+danych"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 "nie aktualizuj pamięci podręcznej bazy danych, tylko wyświetl ścieżki pakietu"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr "Opcje przejścia tree plików:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: makro %%{_cache_dbpath} jest błędnie skonfigurowane.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: operacja w pamięci podręcznej nie powiodła się: ec %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: odczytanie manifestu nie powiodło się: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: odczytaj %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Nie można zapisać ostatecznego nagłówka\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "błąd podczas tworzenia pliku tymczasowego %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "pakiety w wersji 1 nie są obsługiwane przez tę wersję RPM-a\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "tylko pakiety z numerem głównym <= 4 są obsługiwane przez tę wersję RPM-"
+#~ "a\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: nie można podpisać pakietu v1\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: nie można ponownie podpisać pakietu v2\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: podpis nie jest dostępny (RPM v1.0)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Plik %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Plik %s jest mniejszy niż %u bajtów\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Niespełnione zależności dla %s: "
diff --git a/po/pt.po b/po/pt.po
index d9c83e85e..39e62d059 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -10,52 +10,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "não consegui construir dependências:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Não consegui abrir ficheiro spec %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Não consegui abrir o 'pipe' para o tar: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Não consegui ler o ficheiro spec do %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Não consegui mudar o nome de %s para %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "Não consegui analisar o %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "O ficheiro %s não é um ficheiro normal.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "O ficheiro %s não parece ser um ficheiro spec.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "A construir plataformas alvo: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "A construir para o alvo %s\n"
@@ -75,169 +75,169 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Opções de pesquisa (com o -q ou o --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Opções de verificação (com o -V ou o --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "Opções de verificação (com o -V ou o --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Opções de assinatura:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Opções da base de dados:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opções de criação com [ <fich spec> | <fich tar> | <pacote fonte> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opções de Instalação/Actualização/Remoção:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opções comuns para todos os modos do rpm:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versão %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Este programa pode ser distribuído livremente sob os termos da GPL da GNU"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "só pode ser especificado um 'major mode'"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "opções de pesquisa inesperadas"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "formato de pesquisa inesperado"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "origem de pesquisa inesperada"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "só a instalação, a actualização, o rmsource e o rmpspec podem ser forçados"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 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:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "o --prefix só pode ser usado ao instalar pacotes novos"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "os argumentos do --prefix têm de começar por /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 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:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "o --percent só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "o --replacepkgs só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "o --excludedocs  só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "o --includedocs  só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "só uma das opções --excludedocs e --includedocs pode ser usada"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "o --ignorearch só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "o --ignoreos só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "o --ignoresize só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "o --allmatches só pode ser indicado ao apagar o pacote"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "o --allfiles só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -245,7 +245,7 @@ msgstr ""
 "a desactivação de 'scripts' só pode ser indicado durante a instalação ou a "
 "remoção de pacotes"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -253,7 +253,7 @@ msgstr ""
 "a desactivação dos 'triggers' só pode ser usado durante a instalação ou "
 "remoção de pacotes"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -261,7 +261,7 @@ msgstr ""
 "o --nodeps só pode ser indicado durante a criação, reconstrução, "
 "recompilação, instalação, remoção ou verificação do pacote"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -269,7 +269,7 @@ msgstr ""
 "o --test só pode ser indicado durante a instalação, remoção ou criação do "
 "pacote"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -277,106 +277,106 @@ msgstr ""
 "o --root (-r) só pode ser indicado durante a instalação, remoção ou pesquisa "
 "do pacote ou na reconstrução da base de dados"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "os argumentos do --root (-r) têm de começar por /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "não existem ficheiros a assinar\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "não consigo aceder ao ficheiro %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp não encontrado: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Indique a palavra-chave: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "A verificação da palavra-chave falhou\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "A palavra-chave está correcta.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Spec %%_signature inválido no ficheiro de macros.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "o --sign só pode ser usado na criação do pacote"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "o exec falhou\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "não foram indicados pacotes para a reconstrução"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "não foram indicados ficheiros spec para a criação"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "não foram indicados ficheiros tar para a criação"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "não foram indicados pacotes para apagar"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "não foram indicados pacotes para instalar"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "não foram indicados argumentos para a verificação"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Não consegui abrir um ficheiro temporário.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "A executar(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "A execução de %s falhou (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, 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:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -435,92 +435,92 @@ msgstr "&& e || não suportados em cadeias de caracteres\n"
 msgid "syntax error in expression\n"
 msgstr "erro de sintaxe na expressão\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "Falha no TIMECHECK: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Falta um '(' em %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Falta um ')' em %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Elemento %s inválido: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Falta um %s em %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Carácter sem ser espaço a seguir a %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Sintaxe inválida: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Spec de modo inválido: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Spec de dirmode inválido: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Tamanho anormal do locale: \"%.*s\" no %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Locale %.*s duplicado no %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limite atingido para o %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Só um argumento no %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dois ficheiros na mesma linha: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "O ficheiro tem de começar por \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Não é possível misturar o %%doc especial com outras formas: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Ficheiro listado duas vezes: %s\n"
@@ -550,7 +550,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -570,7 +570,7 @@ msgstr "O ficheiro precisa de começar por \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob não permitido: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Ficheiro não encontrado pelo glob: %s\n"
@@ -580,7 +580,7 @@ msgstr "Ficheiro não encontrado pelo glob: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
@@ -590,7 +590,7 @@ msgstr "linha: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Ficheiro inválido: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Dono/grupo inválido: %s\n"
@@ -612,183 +612,174 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "A processar os ficheiros: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: demasiados uid's\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: demasiados uid's\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: demasiados uid's\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: demasiados gid's\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: demasiados gid's\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: demasiados gid's\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Não consegui canonizar o nome da máquina: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "a criação do pacote falhou no ficheiro %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "a criação do arquivo falhou: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "a escrita do cpio_copy falhou: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "a leitura do cpio_copy falhou: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PreIn: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PreUn: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PostIn: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PostUn: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Não consegui abrir o ficheiro VerifyScript: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Não consegui aceder ao 'script' Trigger: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: aceder ao %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: ler o %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: O Fseek falhou: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: o %s não é um pacote RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: a ler o cabeçalho do %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Não consegui criar região imutável do cabeçalho.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr ""
 "Não consegui gravar o cabeçalho temporário\n"
 "\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Dados de CSA inválidos\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Não consegui gravar o cabeçalho final\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "A gerar a assinatura: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Não consegui reler o cabeçalho do assinatura.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Não consigo aceder ao %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Não consegui gravar o pacote: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Não consegui abrir o sigtarget %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Não consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Não consegui ler o conteúdo de %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Não consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Não consigo gerar o ficheiro de saída para o pacote %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "não consigo criar o %s: %s\n"
@@ -798,32 +789,32 @@ msgstr "não consigo criar o %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "linha %d: segundo %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "As entradas de %%changelog têm de começar por *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "entrada de %%changelog incompleta\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "data inválida no %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "O %%changelog não está na ordem cronológica descendente\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "falta o nome no %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "falta a descrição no %%changelog\n"
@@ -833,17 +824,17 @@ msgstr "falta a descrição no %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linha %d: Erro ao analisar a %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linha %d: Opção inválida %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "linha %d: Demasiados nomes: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "linha %d: O pacote não existe: %s\n"
@@ -853,210 +844,210 @@ msgstr "linha %d: O pacote não existe: %s\n"
 msgid "line %d: Second description\n"
 msgstr "linha %d: Segunda descrição\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "linha %d: Erro ao analisar o %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "linha %d: Segunda lista de %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "A arquitectura está excluída: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "A arquitectura não está incluída: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "O SO está excluído: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "O SO não está incluído: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "O campo %s tem de estar presente no pacote: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Entradas %s duplicadas no pacote: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Não consegui abrir o ícone %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Não consegui ler o ícone %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo de ícone desconhecido: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "Linha %d: Opção inválida: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linha %d: Opção em branco: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linha %d: Carácter '-' ilegal no %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "O BuildRoot não pode ser o \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, 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:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linha %d: O campo Epoch/Serial tem de ser um número: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linha %d: Qualificadores %s: inválidos: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linha %d: Formato da BuildArchitecture inválido: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erro interno: Opção esquisita %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Descrição do pacote inválida: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "O pacote já existe: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linha %d: Opção desconhecida: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "O ficheiro spec não pode usar a BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Código-fonte inválido: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Sem número de 'patch' %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Sem número de fonte %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Não consigo transferir o nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Erro ao analisar o %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linha %d: Argumento inválido para %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linha %d: Opção inválida do %%setup %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "linha %d: Necessário o argumento para o %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "linha %d: Necessário o argumento para o %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "linha %d: argumento inválido para o %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "linha %d: Necessário o argumento para o %%patch -z: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "linha %d: argumento inválido para o %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Demasiadas 'patches'!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "linha %d: Argumento inválido para o %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linha %d: segundo %%prep\n"
@@ -1109,299 +1100,303 @@ msgstr "linha %d: Segundo %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "linha %d: Erro ao analisar a %%description: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linha %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Incapaz de aceder ao %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if não fechado\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: o parseExpressionBoolean devolve %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "instrução %%include desorganizada\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Não foram encontradas arquitecturas compatíveis para as quais criar\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote não tem uma %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "O buildroot já foi especificado, a ignorar o %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "criar através do %prep (desempacotar o código e aplicar patches) do "
 "<fichspec>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<fichspec>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "criar através do %build (%prep e depois compilar) do <fichspec>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "criar através do %install (%prep, %build e depois instalar) do <fichspec>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "verificar a secção %files do <fichspec>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "criar os pacotes binários e de código a partir do <fichspec>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "criar só o pacote binário a partir do <fichspec>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "criar só o pacote com código-fonte a partir do <fichspec>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "criar através do %prep (desempacotar o código e aplicar patches) do <fichtar>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<fichtar>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "criar através do %build (%prep e depois compilar) do <fichtar>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "criar através do %install (%prep, %build e depois instalar) do <fichtar>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verificar a secção %files do <fichtar>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "criar os pacotes binários e de código a partir do <fichtar>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "criar só o pacote binário a partir do <fichtar>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "criar só o pacote com código-fonte a partir do <fichtar>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "criar o pacote binário a partir do <pacote de código>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<pacote de código>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "criar através do %install (%prep, %build e depois instalar) do <pacote de "
 "código>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "ignorar a raiz de criação"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "apagar as directorias de criação quando acabar"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "gerar os cabeçalhos compatíveis com o formato do rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignorar as directivas ExcludeArch: do ficheiro spec"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "não executar nenhuma etapa da criação"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "não verificar as dependências de compilação"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "gerar um cabeçalho do pacote compatível com os pacotes do rpm[23]"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "não verificar as dependências do pacote"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "não verifica a arquitectura do pacote"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verificar a assinatura do pacote"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "não aceitar as mensagens de i18N do ficheiro spec"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "apagar o código-fonte quando acabar"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "apagar o ficheiro spec quando acabar"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "saltar directamente para a etapa indicada (só para c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "gerar a assinatura PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "ignorar a plataforma-alvo"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "procurar as mensagens de i18N no catálogo do ficheiro spec"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "gerar os cabeçalhos compatíveis com o formato do rpm[23]"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Não consegui executar o %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Não consegui executar à parte o %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "O %s falhou\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "não consegui escrever todos os dados em %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir de %s falhou: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s rmdir de %s falhou: %s\n"
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "A procurar o %s: (usando o %s)...\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Não consegui encontrar o %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linha %d: Número inválido: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linha %d: Número no%s inválido: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linha %d: Número %s inválido: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "não consigo pesquisar o %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, 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"
@@ -1447,55 +1442,55 @@ msgstr "Ficheiro de arquivo não está no cabeçalho"
 msgid " failed - "
 msgstr " falhou - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "o pacote %s já está instalado"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "o pacote %s já está instalado"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignorar relações entre o nome do pacote [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as relações do tsort\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1503,26 +1498,26 @@ msgid ""
 msgstr ""
 "========== ordenar pacotes (order, #predecessors, #succesors, tree, depth)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== só os sucessores (ordem de apresentação)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(não é um número)"
 
@@ -1534,16 +1529,16 @@ msgstr "(não é um base64)"
 msgid "(invalid type)"
 msgstr "(tipo inválido)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(não é um blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 #, fuzzy
 msgid "(invalid xml type)"
 msgstr "(tipo inválido)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "ignorar as assinaturas de PGP"
@@ -1563,7 +1558,7 @@ msgstr "o mntctl() falhou ao devolver o número de pontos de montagem: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "Não consegui analisar o %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
@@ -1578,12 +1573,12 @@ msgstr "Ficheiro%5d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "o ficheiro %s está num dispositivo desconhecido\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========= Directorias não incluidas explicitamente no pacote:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
@@ -1640,47 +1635,42 @@ msgstr "%s unlink de %s falhou: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s criado como %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "a adicionar %d registos ao índice %s.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "não consigo criar o %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "não consigo escrever em %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "erro ao criar o ficheiro temporário %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1735,189 +1725,180 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "a versão 1 dos pacotes não é suportada por esta versão do RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: o rpmReadSignature falhou\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nenhuma assinatura disponível\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "o %s não pode ser instalado\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "a criar a directoria %s\n"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "imprimir a expansão da macro <expr>+"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 #, 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:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "desactivar o uso da API da libio(3)"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "manda o stdout para <cmd>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "usa <dir> como a directoria de topo"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "mostrar as opções de pesquisa conhecidas"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "mostra a configuração final do rpmrc e das macros"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "devolver um resultado menos detalhado"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "devolver um resultado mais detalhado"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "imprime a versão do RPM que está a usar"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "depurar a E/S da rpmio"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "depurar a gestão da 'cache' de URLs"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2355,7 +2336,7 @@ msgstr "não verificar os ficheiros no pacote"
 msgid "don't verify files in package"
 msgstr "não verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "não verificar as dependências do pacote"
 
@@ -2402,102 +2383,102 @@ msgstr "assinar um pacote (retira a assinatura actual)"
 msgid "generate signature"
 msgstr "gerar a assinatura"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr ""
 "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "o pacote de código-fonte não contem um ficheiro .spec\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: a correr os scripts(s) %s (se existirem)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%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/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s tem %d ficheiros, teste = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Não consegui reler o cabeçalho do assinatura.\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s falhou no ficheiro %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s falhou: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "formato incorrecto: %s\n"
@@ -2599,128 +2580,109 @@ msgstr "número de registo do pacote: %u\n"
 msgid "record %u could not be read\n"
 msgstr "o registo %u não pôde ser lido\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s não está instalado\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s SIM (oferecidos para adição)\n"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: o acesso falhou: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "o makeTempFile falhou\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: O fwrite falhou: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: O Fseek falhou: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "o argumento não é um pacote RPM\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Não consigo assinar o RPM v1.0\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: não consigo assinar de novo o RPM v2.0\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: o writeLead falhou: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: o rpmWriteSignature falhou: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NÃO-OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (FALTAM AS CHAVES:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES SUSPEITAS:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NÃO"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "SIM"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2729,72 +2691,68 @@ msgstr ""
 "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "o pacote %s tem requisitos não satisfeitos: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido à opção missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== mudanças de local\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d excluir o %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d mudar de local %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "a excluir o %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "a mudar o %s para %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "a mudar a directoria %s para %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "opção desconhecida"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "dependências falhadas:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "A preparar..."
@@ -2822,105 +2780,120 @@ msgstr "A preparar..."
 msgid "Upgrading packages..."
 msgstr "actualizar pacote(s)"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "A procurar o %s: (usando o %s)...\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "A obter o %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... como %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "a ignorar o %s - a transferência falhou - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "o %s não pode ser instalado\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<pacote de código>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "o pacote %s não pode ser mudado de sítio\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "a instalar os pacotes binários\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erro ao ler do ficheiros %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "o %s precisa duma versão mais recente do RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "nenhum pacote coincide com %s: %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "encontrados %d pacotes com código-fonte e %d binários\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "a instalar os pacotes binários\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "não consigo aceder ao ficheiro %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "o \"%s\" especifica vários pacotes\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "não consigo aceder ao %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "A instalar o %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "A obter o %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "o argumento não é um pacote RPM\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Nenhuma assinatura disponível\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "a leitura falhou: %s (%d)\n"
@@ -2966,606 +2939,610 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- não suportado em cadeias de caracteres\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "não consigo trancar o %s no %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "não consigo trancar o %s no %s/%s\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "o pacote %s é para uma arquitectura diferente"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "o pacote %s é para um sistema operativo diferente"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "o pacote %s já está instalado"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "a directoria %s no pacote %s não pode ser mudada de sítio"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 "o ficheiro %s está em conflito com as tentativas de instalação do %s e %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "o ficheiro %s da instalação do %s está em conflito com o ficheiro do pacote %"
 "s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "o pacote %s (que é mais recente que o %s) já está instalado"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "a instalação do pacote %s precisa de %ld 'inodes' no sistema de ficheiros %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " é necessário pelo %s-%s-%s\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "não instalado "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " está em conflito com o %s-%s-%s\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "falta o segundo ':' em %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "falta o nome da arquitectura em %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Linha de dados incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Demasiados argumentos na linha de dados em %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Número de arq./SO errado: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Linha por omissão incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Demasiados argumentos na linha por omissão em %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Não consegui ler o %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "falta um ':' (encontrado um 0x%02x) em %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "faltam argumentos para o %s em %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "a expansão do %s falhou em %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "não consigo abrir o %s em %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "falta a arquitectura para o %s em %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "má opção '%s' em %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Sistema desconhecido: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr "Por favor contacte o %s\n"
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Não consigo expandir o %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Não consegui abrir o %s para leitura: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "não consigo abrir a base de dados Packages em %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Falta um '(' em %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "não consigo a base de dados do RPM em %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "linha: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "A obter o %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "Ficheiro%5d: %07o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "a mudar o %s para %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 "Esperado um tamanho: %12d = início(%d)+assin.(%d)+'pad'(%d)+dados(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Tamanho real: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Não consegui executar %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "o pgp falhou\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "o pgp não conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "tamanho da assinatura do PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "incapaz de ler a assinatura\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Obtive %d bytes da assinatura PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "o exec falhou\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "o gpg não conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Tamanho da assinatura do GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Obtive %d bytes da assinatura do GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "'Spec' %%_signature inválido no ficheiro de macros\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, 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"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Tamanho do cabeçalho demasiado grande"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "não verificar o SHA1 do cabeçalho"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "'Digest' MD5 estragado: NÃO SUPORTADO\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr ""
 "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "nenhum pacote coincide com %s: %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<pacote de código>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<pacote de código>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "erro ao ler o cabeçalho do pacote\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "falta     %s"
@@ -3575,60 +3552,60 @@ msgstr "falta     %s"
 msgid "Unknown system error"
 msgstr "Sistema desconhecido: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "erro do db%d (%d) do %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "erro do db%d (%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "fechei o ambiente do db %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "removi o ambiente do db %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "a aceder ao ambiente do db %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "fechei o índice do db   %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "verifiquei o índice do db %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "a abrir o índice do db  %s/%s %s modo=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "não consigo trancar o %s no %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "exclusivo"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "partilhado"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "tranquei o índice do db %s/%s\n"
@@ -3653,76 +3630,76 @@ msgstr "O %s tem um valor demasiado elevado ou pequeno, foi ignorado\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "O %s tem um valor inteiro demasiado elevado ou pequeno, foi ignorado\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "falta um { depois do %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "falta um } depois do %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "formato da opção em branco"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "nome da opção em branco"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "opção desconhecida"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] esperado no fim do vector"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "] inesperado"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "} inesperado"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "esperado um ? na expressão"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "esperado um { a seguir ao ? na expressão"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "esperado um } na expressão"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "esperado um : a seguir à sub-expressão ?"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "esperado um { a seguir ao : na expressão"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "esperado um | no fim da expressão"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3745,385 +3722,371 @@ msgstr ""
 msgid "verify database files"
 msgstr "verificar ficheiros da base de dados"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "gerar os cabeçalhos compatíveis com o formato do rpm[23]"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nome de opção não reconhecido: \"%s\" ignorado\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "não consigo abrir o índice de %s usando o db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "não consigo abrir o índice do %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "não foi definido o dbpath\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: não consigo ler o cabeçalho em 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "a remover o \"%s\" do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "a remover %d registos do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erro(%d) ao remover o registo %s do %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro(%d) ao criar uma nova instância do pacote\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "a adicionar o \"%s\" ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "a adicionar %d registos ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "não foi definido o dbpath"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "a reconstruir a base de dados %s em %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "A base de dados temporária %s já existe\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "a criar a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "a criar a directoria %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "a abrir a base de dados antiga com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "a abrir a base de dados nova com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "não consigo adicionar o registo originalmente em %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "falhou a reconstrução da base de dados: a base de dados original mantém-se\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "falhou a substituição da base de dados antiga pela nova!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "a remover a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falhou a remoção da directoria %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "fechei o ficheiro do db %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "a abrir o índice do db  %s/%s %s modo=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== activo %d vazio %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vazio)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vazio)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Sobrecarga do tampão de destino\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "A macro %%%s tem o conteúdo incompleto\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "A macro %%%s tem um nome inválido (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "A macro %%%s tem as opções incompletas\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "A macro %%%s tem o conteúdo em branco\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "A macro %%%s não conseguiu ser expandida\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "A macro %%%s tem um nome ilegal (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "A macro %%%s (%s) não foi usada abaixo do nível %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opção desconhecida %c em %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Nível de recursividade(%d) maior que o máximo(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c não terminado: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Segue-se uma macro impossível de analisar ao %%\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "A macro %%%.*s não foi encontrada, por isso foi ignorada\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Ficheiro %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "O ficheiro %s tem menos de %u bytes\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- não suportado em cadeias de caracteres\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- não suportado em cadeias de caracteres\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: O fwrite falhou: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: O Fseek falhou: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Sucesso"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Resposta errada do servidor"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Erro de E/S do servidor"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Tempo de espera pelo servidor expirado"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Incapaz de descobrir o endereço da máquina do servidor"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Incapaz de descobrir o nome da máquina do servidor"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Não consegui ligar ao servidor"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Não consigo estabelecer uma ligação de dados ao servidor"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Erro de E/S no ficheiro local"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Erro ao configurar o servidor remoto para o modo passivo"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Ficheiro não encontrado no servidor"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Interrupção em progresso"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Erro desconhecido ou inesperado"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "a leitura falhou: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(nenhum erro)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "erro fatal: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "erro: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "aviso: "
 
@@ -4132,44 +4095,79 @@ msgstr "aviso: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "a alocação de memória (%u bytes) devolveu NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "o porto do URL tem de ser um número\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "não consegui criar o %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "verificar a assinatura do pacote"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Opções de assinatura:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: o acesso falhou: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: a leitura do manifesto falhou: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: ler o %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Não consegui gravar o cabeçalho final\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "erro ao criar o ficheiro temporário %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "a versão 1 dos pacotes não é suportada por esta versão do RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Não consigo assinar o RPM v1.0\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: não consigo assinar de novo o RPM v2.0\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Ficheiro %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "O ficheiro %s tem menos de %u bytes\n"
+
 #, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Dependências não satisfeitas para o %s-%s-%s: "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5f585a41e..6e5cec2ba 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2007-08-03 15:46-0300\n"
 "Last-Translator: Igor Pires Soares <igor@projetofedora.org>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_br@redhat.com>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Falha ao construir dependências:\n"
 
 # , c-format
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Não foi possível abrir o arquivo spec %s: %s\n"
 
 # , c-format
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Não foi possível abrir o pipe do tar: %m\n"
 
 # , c-format
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Falha ao ler o arquivo spec de %s\n"
 
 # , c-format
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Falha ao renomear %s para %s: %m\n"
 
 # , c-format
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "falha ao iniciar %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "O arquivo %s não é um arquivo normal.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "O arquivo %s não parece ser um specfile.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Construindo plataformas de destino: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Construindo para o destino %s\n"
@@ -85,44 +85,44 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Opções de consulta (com -q ou --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Opções de verificação (com -V ou --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr "Opções de fonte (com --query ou --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr "Opções de caminhamento pela árvore de arquivos (com --ftswalk):"
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Opções de assinatura:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Opções de banco de dados:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "opções de construção com [ <specfile> | <tarball> | <pacote fonte> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opções de Instalação/Atualização/Remoção:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opções comuns para todos os executáveis e modos rpm:"
 
 # , c-format
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
@@ -135,138 +135,138 @@ msgstr "%s: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versão %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Este programa pode ser livremente redistribuído sob os termos da GNU GPL\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Erro interno no processamento do argumento (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "sinalizador de consulta não esperado"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "formato de consulta não esperado"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "fonte de pesquisa não esperada"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "somente a instalação, atualização, rmsource e rmspec podem ser forçados"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr ""
 "os arquivos somente podem ser realocados durante a instalação de pacotes"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "não é possível usar --prefix com --relocate ou --excludepath"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix somente pode ser usado na instalação de novos pacotes"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem começar com uma /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente pode ser especificado durante instalação de pacotes"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalação de pacotes"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalação de pacotes"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoresize somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante a remoção de pacotes"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--allfiles somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -274,7 +274,7 @@ msgstr ""
 "opções de desativação de scripts somente podem ser especificadas durante a "
 "instalação ou remoção de pacotes"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -282,7 +282,7 @@ msgstr ""
 "opções de desativação de disparador somente podem ser especificadas durante "
 "a instalação ou remoção de pacotes"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -290,7 +290,7 @@ 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:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -298,7 +298,7 @@ msgstr ""
 "--test somente pode ser especificado durante a instalação, remoção e "
 "construção de pacotes"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -306,87 +306,87 @@ msgstr ""
 "--root (-r) somente pode ser especificado durante a instalação, remoção, "
 "consulta e reconstrução de bancos de dados"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "os argumentos para --root (-r) devem começar com uma /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "nenhum arquivo para assinar\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "não foi possível acessar o arquivo %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp não encontrada: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Digite a senha: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "A verificação da senha falhou\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Senha ok.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Especificação %%_signature inválida no arquivo macro.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign somente pode ser usado durante a construção de pacotes"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "a execução falhou\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "nenhum pacote foi passado para reconstrução"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "nenhum arquivo spec foi passado para construção"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "não foram passados arquivos tar para construção"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "nenhum pacote foi passado para remoção"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "nenhum pacote foi passado para instalação"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "nenhum argumento foi passado para consulta"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "nenhum argumento foi passado para verificação"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "nenhum argumento foi passado"
 
 # , c-format
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Não foi possível abrir o arquivo temporário.\n"
 
@@ -398,23 +398,23 @@ msgstr "Não foi possível abrir o arquivo temporário.\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Executando (%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, 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:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Status de saída de %s inválido (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -473,98 +473,98 @@ msgstr "&& e || não são suportados para strings\n"
 msgid "syntax error in expression\n"
 msgstr "erro de sintaxe na expressão\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "Falha no TIMECHECK: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "\"(\" faltando em %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "\"(\" faltando em %s(%s\n"
 
 # , c-format
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Token de %s inválido: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s faltando em %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "caractere de espaço após %s(): %s\n"
 
 # , c-format
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Sintaxe inválida: %s(%s)\n"
 
 # , c-format
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Modo spec inválido: %s(%s)\n"
 
 # , c-format
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Dirmode spec inválido: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Tamanho de localidade não usual: \"%.*s\" em %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Localidade %.*s duplicada em %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limite alcançado para %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Apenas um argumento para %%docdir\n"
 
 # , c-format
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dois arquivos em uma linha: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "O arquivo deve começar com uma \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Não é possível misturar %%doc especial com outras formas: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr "_docdir_fmt inválido: %s\n"
 
 # , c-format
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Arquivo listado duas vezes: %s\n"
@@ -596,7 +596,7 @@ msgstr "%s: não foi possível carregar a etiqueta desconhecida (%d).\n"
 msgid "%s: public key read failed.\n"
 msgstr "%s: falha ao ler a chave pública.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: não é uma chave pública blindada.\n"
@@ -618,7 +618,7 @@ msgstr "O arquivo precisa da \"/\" inicial: %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob não permitido: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "O arquivo não foi encontrado pelo glob: %s\n"
@@ -630,7 +630,7 @@ msgid "Could not open %%files file %s: %s\n"
 msgstr "Não foi possível abrir %%files arquivo %s: %s\n"
 
 # , c-format
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
@@ -641,7 +641,7 @@ msgstr "linha: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Arquivo inválido: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Proprietário/grupo inválido: %s\n"
@@ -665,207 +665,196 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Processando arquivos: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: uid's em excesso\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: uid's em excesso\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: uid's em excesso\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: gid's em excesso\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: gid's em excesso\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: gid's em excesso\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Não foi possível canonizar o nome de máquina: %s\n"
 
 # , c-format
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "a criação do pacote falhou no arquivo %s: %s\n"
 
 # , c-format
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "a criação do pacote falhou: %s\n"
 
 # , c-format
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "a gravação cpio_copy falhou: %s\n"
 
 # , c-format
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "a leitura cpio_copy falhou: %s\n"
 
 # , c-format
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Não foi possível abrir o arquivo PreIn: %s\n"
 
 # , c-format
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Não foi possível abrir o arquivo PreUn: %s\n"
 
 # , c-format
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Não foi possível abrir o arquivo PostIn: %s\n"
 
 # , c-format
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Não foi possível abrir o arquivo PostUn: %s\n"
 
 # , c-format
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Não foi possível abrir o arquivo VerifyScript: %s\n"
 
 # , c-format
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Não foi possível abrir o arquivo do script Trigger: %s\n"
 
 # , c-format
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: abrir %s: %s\n"
 
 # , c-format
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: ler %s: %s\n"
-
-# , c-format
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek falhou: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s não é um pacote RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: lendo cabeçalho a partir de %s\n"
 
 # , c-format
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Não foi possível criar uma região de cabeçalho imutável.\n"
 
 # , c-format
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "Não foi possível gravar o cabeçalho temporário\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Dados CSA inválidos\n"
 
-# , c-format
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Não foi possível gravar o cabeçalho final\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Gerando assinatura: %d\n"
 
 # , c-format
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Não foi possível recarregar o cabeçalho da assinatura.\n"
 
 # , c-format
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Não foi possível abrir %s: %s\n"
 
 # , c-format
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Não foi possível gravar o pacote: %s\n"
 
 # , c-format
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Não foi possível abrir sigtarget %s: %s\n"
 
 # , c-format
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Não foi possível ler o cabeçalho a partir de %s: %s\n"
 
 # , c-format
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Não foi possível gravar o cabeçalho em %s: %s\n"
 
 # , c-format
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Não foi possível ler carga útil a partir de %s: %s\n"
 
 # , c-format
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Não foi possível gravar carga útil em %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravou: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 "Não foi possível gerar o nome de arquivo de saída para o pacote %s: %s\n"
 
 # , c-format
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Não foi possível criar %s: %s\n"
@@ -876,32 +865,32 @@ msgstr "Não foi possível criar %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "linha %d: segundo %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "entradas do %%changelog devem começar com *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "entrada do %%changelog incompleta\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "data inválida no %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog não está na ordem cronológica decrescente\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "Nome faltando no %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "nenhuma descrição no %%changelog\n"
@@ -912,19 +901,19 @@ msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linha %d: Erro ao analisar %%description: %s\n"
 
 # , c-format
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, 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:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "linha %d: Nomes em excesso: %s\n"
 
 # , c-format
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "linha %d: O pacote não existe: %s\n"
@@ -935,23 +924,23 @@ msgid "line %d: Second description\n"
 msgstr "linha %d: Segunda descrição\n"
 
 # , c-format
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "linha %d: Erro ao analisar %%files: %s\n"
 
 # , c-format
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "linha %d: Segunda lista %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "A arquitetura está excluída: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "A arquitetura não está excluída: %s\n"
@@ -964,212 +953,212 @@ msgstr "A arquitetura não está excluída: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "O SO está excluído: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "O SO não está incluído: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "o campo %s deve estar presente no pacote: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Entrada %s duplicada no pacote: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Não foi possível abrir o ícone %s: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Não foi possível ler o ícone %s: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo de ícone desconhecido: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linha %d: Etiqueta mal formada: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linha %d: Etiqueta vazia: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linha %d: caractere inválido \"-\" em %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot não pode ser \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, 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:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linha %d: campo Epoch/Serial deve ser um número: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linha %d: %s inválido: qualificadores: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linha %d: formato BuildArchitecture inválido: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erro interno: tag %d falsa\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr "Sintaxe legada não suportada: %s\n"
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Especificação do pacote inválida: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "O pacote já existe: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linha %d: Etiqueta desconhecida: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "O arquivo spec não pode utilizar o BuildRoot\n"
 
 # , c-format
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Fonte inválida: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Nenhum número do patch %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Nenhum número do fonte %d\n"
 
 # , c-format
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Não foi possível baixar nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Erro ao analisar %%setup: %s\n"
 
 # , c-format
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linha %d: Argumento inválido para %%setup: %s\n"
 
 # , c-format
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linha %d: Opção inválida %s de %%setup: %s\n"
 
 # , c-format
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "linha %d: É necessário um argumento para %%patch -b: %s\n"
 
 # , c-format
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "linha %d: É necessário um argumento para %%patch -z: %s\n"
 
 # , c-format
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "linha %d: Argumento inválido para %%patch -F: %s\n"
 
 # , c-format
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "linha %d: É necessário um argumento para %%patch -p: %s\n"
 
 # , c-format
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "linha %d: Argumento inválido para %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Correções em excesso!\n"
 
 # , c-format
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "linha %d: Argumento inválido para %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linha %d: segundo %%prep\n"
@@ -1227,315 +1216,319 @@ msgid "line %d: unsupported internal script: %s\n"
 msgstr "linha %d: script interno não suportado: %s\n"
 
 # , c-format
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linha %d: %s\n"
 
 # , c-format
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Não foi possível abrir %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if não fechado\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d:  parseExpressionBoolean retornou %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "instrução %%include mal formada\n"
 
 # , c-format
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Nenhuma arquitetura compatível encontrada para a construção\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote não tem %%description: %s\n"
 
 # , c-format
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot já especificado, ignorando %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "construir através de %prep (desempacote os fontes e aplique as correções) a "
 "partir do <specfile>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<specfile>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 "construir através de %build (%prep, então compile) a partir do <specfile>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "construir através de %install (%prep, %build, então instale) a partir do "
 "<specfile>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "verificar seção %files do <specfile>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "construir os pacotes fontes e binários a partir do <specfile>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "construir pacote binário somente a partir do <specfile>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "construir pacote fonte somente a partir do <specfile>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "construir através de %prep (desempacote os fontes e aplique as correções) a "
 "partir do <tarball>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 "construindo através de %build (%prep, então compile) a partir do <tarball>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "construir através de %install (%prep, %build, então instale) a partir do "
 "<tarball>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verificar seção %files do <tarball>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "construir os pacotes fontes e binários a partir do <tarball>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "construir pacote binário somente a partir do <tarball>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "construir pacote fonte somente a partir do <tarball>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "construir pacote binário a partir do <pacote fonte>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<pacote fonte>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "construir através de %install (%prep, %build, então instale) a partir do "
 "<pacote fonte>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "substituir raíz da construção"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "remover a árvore de construção quando terminar"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "gerar cabeçalhos compatíveis com o empacotamento do rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignorar ExcludeArch: diretivas do arquivo spec"
 
 # , c-format
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "depurar máquina de estados do arquivo"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "não executar nenhum estágio da construção"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "não verificar dependências de construção"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "gerar cabeçalhos de pacotes compatíveis com o empacotamento do rpm[23] "
 "(legado)"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "não verificar digest(s) dos pacotes"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "não verificar cabeçalho(s) do banco de dados ao recuperá-lo(s)"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "não verificar a(s) assinatura(s) do pacote"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "não aceitar msgstr's i18N do specfile"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "remover fontes ao finalizar"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "remover specfile ao finalizar"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "pule direto para o estágio especificado (somente para c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "gerar assinatura PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "substituir plataforma de destino"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "procurar strings i18N no catálogo do specfile"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "gerar cabeçalhos compatíveis com o empacotamento (legado) rpm[23]"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
 # , c-format
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Não foi possível executar %s: %s\n"
 
 # , c-format
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Não foi possível bifurcar %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, fuzzy, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr "%s: waitpid(%d) rc %d status %x segs %u.%03u\n"
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s falhou: %s\n"
 
 # , c-format
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "Não foi possível gravar carga útil em %s: %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "falha ao abrir %s: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir de %s falhou: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, fuzzy, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr "%s rmdir de %s falhou: %s\n"
 
 # , c-format
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Arquivo %s: %s\n"
 
 # , c-format
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Falha ao ler %s: %s.\n"
 
 # , c-format
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linha %d: Número inválido: %s\n"
 
 # , c-format
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linha %d: Número %s inválido: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linha %d: Número %s inválido: %s\n"
 
 # , c-format
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "Não foi possível consultar %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, 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"
@@ -1581,54 +1574,54 @@ msgstr "Arquivo de pacote não está no cabeçalho"
 msgid " failed - "
 msgstr " falhou - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "o pacote %s já foi adicionado, ignorando %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "o pacote %s já foi adicionado, substituindo por %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr "  Obsoletos: %s\t\tremove %s\n"
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(em cache)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib fornece)"
 
 # , c-format
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(arquivos db)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(db fornece)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignorar relações do nome dos pacotes [%d]\t%s -> %s\n"
 
 # , c-format
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "removendo %s \"%s\" das relações do tsort.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== gravando relações do tsort\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
@@ -1636,26 +1629,26 @@ msgstr ""
 "========== tsorting dos pacotes (ordem, #predecessores, #sucessores, "
 "árvore,  profundidade, extensão)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== sucessores apenas (%d bytes)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== continuando tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder falhou, permaneceram %d elementos\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(não é um número)"
 
@@ -1667,15 +1660,15 @@ msgstr "(não é base 64)"
 msgid "(invalid type)"
 msgstr "(tipo inválido)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(não é um blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(tipo xml inválido)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(não é uma assinatura OpenPGP)"
 
@@ -1697,7 +1690,7 @@ msgid "failed to stat %s: %s\n"
 msgstr "falha ao iniciar %s: %s\n"
 
 # , c-format
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "falha ao abrir %s: %s\n"
@@ -1713,12 +1706,12 @@ msgstr "%5d 0x%04x %s %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "o arquivo %s está em um dispositivo desconhecido\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== Diretórios não incluídos explicitamente no pacote:\n"
 
 # , c-format
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1777,52 +1770,46 @@ msgid "%s created as %s\n"
 msgstr "%s criado como %s\n"
 
 # , c-format
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "adicionando %d argumentos do manifesto.\n"
 
 # , c-format
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "não foi possível criar %%%s %s\n"
 
 # , c-format
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "não foi possível gravar em %%%s %s\n"
 
-# , c-format
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "erro ao criar o arquivo temporário %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "tamanho do blob(%d): INVÁLIDO, 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "etiqueta[%d]: INVÁLIDA, etiqueta %d tipo %d offset %d contagem %d\n"
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 "offset da região: INVÁLIDA, etiqueta %d tipo %d offset %d contagem %d\n"
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 "trailer da região: INVÁLIDA, etiqueta %d tipo %d offset %d contagem %d\n"
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "tamanho da região: INVÁLIDO, ril(%d) > il(%d)\n"
@@ -1877,189 +1864,186 @@ msgstr "blob hdr (%d): INVÁLIDO, a leitura retornou %d\n"
 msgid "hdr load: BAD\n"
 msgstr "carregamento hdr: INVÁLIDO\n"
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "a versão de empacotamento 1 não é suportada por esta versão do RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"apenas empacotamentos com versões de números maiores <=4 são suportadas por "
-"esta versão do RPM\n"
-
 # , c-format
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature falhou: %s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nenhuma assinatura disponível\n"
 
 # , c-format
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead falhou: %s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr "ignorando pacote %s com assinatura V%u não verificável\n"
 
 # , c-format
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread falhou: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s é um Delta RPM e não pode ser instalado diretamente\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Carga útil (%s) não suportada no pacote %s\n"
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+#, fuzzy
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "FTS_COMFOLLOW: seguir ligações simbólicas da linha de comandos"
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+#, fuzzy
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "FTS_LOGICAL: caminhamento lógico"
 
 # , c-format
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+#, fuzzy
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "FTS_NOCHDIR: não alterar os diretórios"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+#, fuzzy
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "FTS_NOSTAT: não obter informações de estatísticas"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+#, fuzzy
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "FTS_PHYSICAL: caminhamento físico"
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+#, fuzzy
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "FTS_SEEDOT: retornar ponto e ponto-ponto"
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+#, fuzzy
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "FTS_XDEV: não cruzar dispositivos"
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+#, fuzzy
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "FTS_WHITEOUT: retornar informação whiteout"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "predefinir MACRO com valor EXPR"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "\"MACRO EXPR\""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "definir MACRO com valor EXPR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "imprimir expansão do macro da EXPR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "\"EXPR\""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ler <ARQUIVO:...> ao invés do(s) arquivo(s) padrão"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<ARQUIVO:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "desabilitar o uso da API libio(3)"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "enviar stdout para CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "utilizar ROOT como o diretório de nível mais alto"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "exibir etiquetas de consulta conhecidas"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "exibir configuração final do rpmrc e do macro"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "fornece uma saída menos detalhada"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "fornece uma saída mais detalhada"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "mostra a versão do rpm que está sendo usada"
 
 # , c-format
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "depurar máquina de estados do arquivo de carga últil"
 
 # , c-format
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr "utilizar threads para a máquina de estados do arquivo"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "depurar processamento de opções/argumentos"
 
 # , c-format
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "depurar máquina de estados do pacote"
 
 # , c-format
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr "utilizar threads para a máquina de estados do pacote"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "depurar E/S rpmio"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "depurar tratamento de cache URL"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabela de opções mal configurada (%d)\n"
@@ -2483,7 +2467,7 @@ msgstr "não verificar os contextos de segurança dos arquivos"
 msgid "don't verify files in package"
 msgstr "não verificar os arquivos do pacote"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "não verificar as dependências do pacote"
 
@@ -2523,100 +2507,100 @@ msgstr "assinar pacote(s) (idêntico ao --addsign)"
 msgid "generate signature"
 msgstr "gerar assinatura"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "um pacote fonte era esperado, mas um binário foi encontrado\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "o pacote fonte não contém um arquivo .spec\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rc %d status %x segs %u.%03u\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s.%s) executando scriptlet <lua>.\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s.%s) ignorando redundantes \"%s\".\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s.%s) início do scriptlet %ssynchronous\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s.%s) o scriptlet falhou, waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s.%s) o scriptlet falhou, sinal %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s.%s) o scriptlet falhou, status de saída %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s tem %d arquivos, teste = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s o scriptlet falhou (%d), ignorando %s\n"
 
 # , c-format
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "Não foi possível recarregar o cabeçalho de assinatura\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a descompactação do arquivo falhou %s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " no arquivo "
 
 # , c-format
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s falhou no arquivo %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s falhou: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr "Tentando marcar %s como instalado no placar (%p).\n"
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr "Tentando marcar %s como removido no placar (%p).\n"
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "formato incorreto: %s\n"
@@ -2718,135 +2702,116 @@ msgstr "número de registro do pacote: %u\n"
 msgid "record %u could not be read\n"
 msgstr "o registro %u não pôde ser lido\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s não está instalado\n"
 
 # , c-format
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(arquivos adicionados)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(capacidade adicionada)"
 
 # , c-format
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: falha ao abrir: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile falhou\n"
 
 # , c-format
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite falhou: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fflush falhou: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: não é um pacote rpm\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Não é possível assinar o empacotamento v1\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Não é possível assinar novamente o empacotamento v2\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: já foi assinado pela chave de ID %s, ignorando\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead falhou: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature falhou: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: leitura de importação falhou (%d).\n"
 
 # , c-format
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: a importação falhou.\n"
 
 # , c-format
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead falhou\n"
 
 # , c-format
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry falhou\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Nenhuma assinatura disponível (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "Não está OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (CHAVES FALTANDO:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES NÃO CONFIÁVEIS:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NÃO "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "SIM"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2856,22 +2821,22 @@ msgstr ""
 "\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "o pacote %s tem %s não satisfeito: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido ao sinalizador missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== realocações\n"
 
@@ -2883,13 +2848,13 @@ msgstr "========== realocações\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d exclui %s\n"
 
 # , c-format
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d realoca %s -> %s\n"
@@ -2902,45 +2867,41 @@ msgstr "%5d realoca %s -> %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "excluindo %s %s\n"
 
 # , c-format
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "realocando %s para %s\n"
 
 # , c-format
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "realocando diretório %s para %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "falha ao abrir %s: %s\n"
 
 # , c-format
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "etiqueta desconhecida: \"%s\"\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Dependências não satisfeitas:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    Resoluções sugeridas:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Preparando..."
@@ -2966,7 +2927,7 @@ msgid "Upgrading packages..."
 msgstr "Atualizando pacotes..."
 
 # , c-format
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "Adicionando meta: %s\n"
@@ -2979,93 +2940,93 @@ msgstr "Adicionando meta: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Obtendo %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... como %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "ignorando %s - a transferência falhou - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s não pode ser instalado\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "\tpacote fonte adicionado [%d]\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr "o pacote %s não é realocável\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "\tpacote binário adicionado [%d]\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erro ao ler o arquivo %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "o arquivo %s requer uma versão mais recente do RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: não é um pacote rpm (ou um manifesto de pacote): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "foram encontrados %d pacotes fontes e %d binários\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "instalando pacotes binários\n"
 
 # , c-format
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Não foi possível abrir o arquivo %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" especifica múltiplos pacotes\n"
 
 # , c-format
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Não foi possível abrir %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalando %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Recuar pacotes (+%d/-%d) para %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "Limpando pacotes reempacotados:\n"
 
@@ -3077,13 +3038,28 @@ msgstr "Limpando pacotes reempacotados:\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\tRemovendo %s:\n"
 
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: não é um pacote rpm\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Nenhuma assinatura disponível\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
 # , c-format
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "falha na leitura: %s (%d)\n"
@@ -3136,215 +3112,215 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "suporte interno para scripts lua."
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "criar conjunto de transações"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "Criando placar (%p, %p) da transação\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "diferente"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "o pacote %s é destinado para a arquitetura %s"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "o pacote %s é destinado para o sistema operacional %s"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "o pacote %s já está instalado"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "o caminho %s no pacote %s não é realocável"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "o arquivo %s conflita entre a tentativa de instalação de %s e %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "o arquivo %s da instalação de %s conflita com o arquivo do pacote %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "o pacote %s (que é mais recente que o %s) já está instalado"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "a instalação do pacote %s precisa de %ld%cB no sistema de arquivos %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "a instalação do pacote %s precisa de %ld inodes no sistema de arquivos %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s é requerido por %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(instalado) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s conflita com %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "erro desconhecido %d encontrado ao manipular o pacote %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "segundo \":\" faltando em %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "nome da arquitetura faltando em %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Linha de dados incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Argumentos em excesso na linha de dados em %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Número de arquitetura/SO inválido: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Linha padrão incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Argumentos em excesso na linha padrão em %s:%d\n"
 
 # , c-format
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Falha ao ler %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "\":\" faltando (0x%02x encontrado) em %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "argumento faltando para %s em %s:%d\n"
 
 # , c-format
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "a expansão do %s falhou em %s:%d \"%s\"\n"
 
 # , c-format
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "não foi possível abrir %s em %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "arquitetura faltando para %s em %s:%d\n"
 
 # , c-format
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "opção inválida \"%s\" em %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Sistema desconhecido: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr "Por favor, contate %s\n"
 
 # , c-format
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Não foi possível expandir %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Não foi possível ler %s, HOME é muito grande.\n"
 
 # , c-format
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Não foi possível abrir %s para leitura: %s\n"
 
 # , c-format
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "não foi possível abrir o banco de dados de pacotes em %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "\"(\" extra no rótulo do pacote: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "\"(\" faltando no rótulo do pacote: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "\")\" faltando no rótulo do pacote: %s\n"
 
 # , c-format
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "não foi possível abrir o banco de dados Solve em %s\n"
 
 # , c-format
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Adicionando: %s\n"
@@ -3357,233 +3333,237 @@ msgstr "Adicionando: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Sugerindo: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    Resoluções sugeridas:\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "sistemas de arquivos montados:\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr "    i        dis    tamb       bavail       ponto de montagem iavail\n"
 
 # , c-format
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%08x %8u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr "Criando placar (%p, %p) da transação\n"
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr "\tEndereço do placar:  %p\n"
 
 # , c-format
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\tAlocando espaço para %d entradas\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr "\tAdicionando entrada %s ao placar.\n"
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr "\t\tEndereço da entrada:  %p\n"
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr "\tAtualizando entrada para o %s no placar.\n"
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr "Liberar placar (%p)\n"
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr "\tRefcount é zero... irá liberar\n"
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr "Procurando no placar (%p) por %s\n"
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr "\tEntrada encontrada no endereço:  %p\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Tamanho esperado: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Tamanho real: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "sigh size(%d): INVÁLIDO, a leitura retornou %d\n"
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr "sigh magic: INVÁLIDO\n"
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr "sigh tags: INVÁLIDO, número de etiquetas (%d) fora do intervalo\n"
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr "sigh data: INVÁLIDO, número de bytes (%d) fora do intervalo\n"
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr "sigh blob(%d): INVÁLIDO, a leitura retornou %d\n"
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "sigh tag[%d]: INVÁLIDO, etiqueta %d tipo %d offset %d contagem %d\n"
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr "sigh load: INVÁLIDO\n"
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr "sigh pad(%d): INVÁLIDO, %d bytes lidos\n"
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr "sigh sigSize(%d): INVÁLIDO, fstat(2) falhou\n"
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Assinatura: tamanho(%d)+enchimento(%d)\n"
 
 # , c-format
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Não foi possível executar %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp falhou\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "o pgp falhou ao gravar a assinatura\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Tamanho da assinatura PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "não foi possível ler a assinatura\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "%d bytes obtidos da assinatura PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "a execução do gpg falhou (%d)\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "o gpg falhou ao gravar a assinatura\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Tamanho da assinatura GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "%d bytes obtidos da assinatura GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Spec %%_signature inválido no arquivo macro\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, 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"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Você deve definir o \"%%_pgp_name\" no seu arquivo de macro\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "Tamanho do Cabeçalho+Carga útil: "
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "Digest MD5: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "Digest do Cabeçalho SHA1: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Cabeçalho "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 msgid " signature: "
 msgstr " assinatura:"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr " assinatura DSA: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verificação de assinatura: PARÂMETROS INVÁLIDOS\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Digest MD5 defeituoso: NÃO SUPORTADO\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Assinatura: DESCONHECIDA (%d)\n"
@@ -3596,169 +3576,169 @@ msgstr "Assinatura: DESCONHECIDA (%d)\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "excluindo diretório %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr "A transação falhou... recuando\n"
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr "Não foi possível ordenar a transação de auto-recuo!\n"
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr "Obtendo o cabeçalho reempacotado a partir do elemento da transação\n"
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\tProcurando por %s...\n"
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr "\tResultados encontrados.\n"
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr "\tNenhum resultado encontrado.\n"
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr "\tPacote reempacotado não encontrado!\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr "\tREMOVETID coincide com INSTALLTID.\n"
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\tNome:  %s.\n"
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\tO pacote reempacotado era %s...\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr "Adicionando elemento de instalação à transação de auto-recuo.\n"
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 "Não foi possível obter a instância do banco de dados do elemento de "
 "instalação!\n"
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr "Não foi possível obter o cabeçalho da transação de auto-recuo!\n"
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\tCabeçalho do pacote reempacotado adicionado: %s.\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr "\tAdicionado a partir do elemento de instalação %s.\n"
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr "\tElemento de remoção adicionado.\n"
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 "Não foi possível obter o cabeçalho reempacotado para a transação de auto-"
 "recuo!\n"
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr "Adicionar um elemento de remoção à transação de auto-recuo.\n"
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr "\tElemento de atualização existente encontrado.\n"
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr "\tNão está adicionando um elemento de remoção para %s.\n"
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\tPacote reempacotado %s adicionado.\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\tAdicionado a partir de um elemento de remoção %s.\n"
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 "Não foi possível adicionar um elemento de remoção à transação de auto-"
 "recuo.\n"
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr "\tNenhum pacote reempacotado... nada a ser feito.\n"
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr "Falha ao ler o pacote reempacotado!\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "verificando a integridade de %d elementos\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr "executando scripts de pré-transação\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "computando %d impressões digitais do arquivo\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "computando disposições dos arquivos\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr "Criando transação de auto-recuo\n"
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr "A adição falhou. Não foi possível ler o cabeçalho do pacote.\n"
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "A adição falhou no rpmpsmStage().\n"
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr "A adição falhou. Não foi possível obter a lista de arquivos.\n"
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "A remoção falhou no rpmpsmStage().\n"
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr "executando scripts de pós-transação\n"
 
 # , c-format
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr "%c %s faltando"
@@ -3768,60 +3748,60 @@ msgstr "%c %s faltando"
 msgid "Unknown system error"
 msgstr "Sistema desconhecido: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "erro db%d (%d) de %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "erro db%d (%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "ambiente db fechado %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "ambiente db removido %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "abrindo ambiente db %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "índice db fechado %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "índice db verificado %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "abrindo índice db %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "não foi possível obter o bloqueio %s em %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "exclusivo"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "compartilhado"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "índice db bloqueado %s/%s\n"
@@ -3846,76 +3826,76 @@ msgstr "%s tem valor inteiro longo muito grande ou muito pequeno, ignorado\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s tem um valor inteiro muito grande ou muito pequeno, ignorado\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "{ faltando após %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "} faltando após %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "formato da etiqueta vazio"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "nome da etiqueta vazio"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "etiqueta desconhecida"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] esperado no fim da matriz"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "] não esperado"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "} não esperado"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? esperado na expressão"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ esperado após ? na expressão"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} esperado na expressão"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ": esperado após a subexpressão ?"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ esperado após : na expressão"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| esperado no fim da expressão"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(índice fora do intervalo)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "iterador da matriz utilizado com diferentes tamanhos de matrizes"
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -3938,185 +3918,181 @@ msgstr ""
 msgid "verify database files"
 msgstr "verificar arquivos do banco de dados"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "gerar cabeçalhos compatíveis com o empacotamento (legado) rpm[23]"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nome da etiqueta não reconhecido: \"%s\" ignorado\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, 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"
 
 # , c-format
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "não foi possível abrir o índice %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "nenhum dbpath foi definido\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, 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"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: ignorando"
 
 # , c-format
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erro (%d) ao armazenar o registro #%d em %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: ignorando"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: cabeçalho danificado #%u recuperado -- ignorando.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, 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
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "erro (%d) ao definir o registro do cabeçalho #%d para remoção de %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "removendo \"%s\" do índice de %s.\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "removendo %d entradas a partir do índice %s.\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, 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
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erro (%d) ao armazenar o registro \"%s\" em %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erro (%d) ao remover o registro \"%s\" a partir de %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro (%d) ao alocar nova instância do pacote\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: ignorando"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "adicionando \"%s\" ao índice de %s.\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "adicionando %d entradas ao índice %s.\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erro (%d) ao armazenar o registro %s em %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "removendo %s após a recompilação bem sucedida do db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "nenhum dbpath foi definido"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstruindo o banco de dados %s em %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "o banco de dados temporário %s já existe\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "criando o diretório %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "criando o diretório %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "abrindo o banco de dados antigo com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "abrindo o novo banco de dados com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, 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"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "não é possível adicionar o registro originalmente em %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 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"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "falha ao substituir o banco de dados velho pela novo!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, 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"
@@ -4129,221 +4105,210 @@ msgstr "substituir arquivos em %s com arquivos de %s para recuperação"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "removendo o diretório %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falha ao remover o diretório %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "índice db fechado %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "abrindo índice db %s/%s %s mode=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d ativo %d vazio\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vazio)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vazio)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Estouro de buffer do destino\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "O macro %%%s tem um corpo incompleto\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "O macro %%%s tem um nome inválido (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "O macro %%%s tem opções incompletas\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "O macro %%%s tem um corpo vazio\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "O macro %%%s falhou ao expandir\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "O macro %%%s tem um nome inválido (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "O macro %%%s (%s) não foi usado abaixo do nível %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opção desconhecida %c em %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Profundidade de recursão (%d) maior do que o máximo (%d)\n"
 
 # , c-format
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c incompleto: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Um %% é seguido por um macro não analisável\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Macro %%%.*s não encontrado, ignorando\n"
 
-# , c-format
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Arquivo %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "O arquivo %s é menor que %u bytes\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "Sintaxe legada não suportada: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "Sintaxe legada não suportada: %s\n"
 
 # , c-format
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite falhou: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
 # , c-format
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fflush falhou: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Sucesso"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Resposta inválida do servidor"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Erro de E/S do servidor"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Tempo esgotado para o servidor"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Não foi possível procurar o endereço de máquina do servidor"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Não foi possível procurar o nome de máquina do servidor"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Falha ao conectar no servidor"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Falha ao estabelecer a conexão de dados com o servidor"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Erro de E/S para o arquivo local"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Erro ao configurar o servidor remoto para o modo passivo"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Arquivo não encontrado no servidor"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Interrupção em andamento"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Erro desconhecido ou não esperado"
 
 # , c-format
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "falha na leitura: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(sem erros)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "erro fatal: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "erro: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "aviso: "
 
@@ -4352,46 +4317,85 @@ msgstr "aviso: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "a alocação de memória (%u bytes) retornou NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "a porta url deve ser um número\n"
 
 # , c-format
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "falha ao criar %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "não verificar a assinatura do cabeçalho+carga útil"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 "não atualizar o cache do banco de dados, apenas imprimir os caminhos do "
 "pacote"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr "Opções de caminhamento na árvore de arquivos:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: o macro %%{_cache_dbpath} está mal configurado.\n"
 
 # , c-format
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: falha na operação do cache: ec %d.\n"
 
 # , c-format
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: falha na leitura do manifesto: %s\n"
 
+# , c-format
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: ler %s: %s\n"
+
+# , c-format
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Não foi possível gravar o cabeçalho final\n"
+
+# , c-format
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "erro ao criar o arquivo temporário %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr ""
+#~ "a versão de empacotamento 1 não é suportada por esta versão do RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "apenas empacotamentos com versões de números maiores <=4 são suportadas "
+#~ "por esta versão do RPM\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Não é possível assinar o empacotamento v1\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Não é possível assinar novamente o empacotamento v2\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Nenhuma assinatura disponível (v1.0 RPM)\n"
+
+# , c-format
+#~ msgid "File %s: %s\n"
+#~ msgstr "Arquivo %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "O arquivo %s é menor que %u bytes\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Dependências não satisfeitas para %s: "
diff --git a/po/rpm.pot b/po/rpm.pot
index 3f142f398..13b092fef 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -16,51 +16,51 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
@@ -80,290 +80,290 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr ""
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr ""
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -419,92 +419,92 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr ""
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr ""
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr ""
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr ""
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr ""
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
@@ -534,7 +534,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -554,7 +554,7 @@ msgstr ""
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
@@ -564,7 +564,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -574,7 +574,7 @@ msgstr ""
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
@@ -596,181 +596,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr ""
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr ""
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -780,32 +771,32 @@ msgstr ""
 msgid "line %d: second %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr ""
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr ""
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr ""
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr ""
@@ -815,17 +806,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -835,210 +826,210 @@ msgstr ""
 msgid "line %d: Second description\n"
 msgstr ""
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr ""
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr ""
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr ""
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr ""
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1089,289 +1080,293 @@ msgstr ""
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr ""
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr ""
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr ""
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr ""
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr ""
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr ""
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr ""
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr ""
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr ""
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr ""
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr ""
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr ""
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr ""
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr ""
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr ""
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr ""
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1417,77 +1412,77 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr ""
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr ""
 
@@ -1499,15 +1494,15 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr ""
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr ""
 
@@ -1526,7 +1521,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr ""
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
@@ -1541,11 +1536,11 @@ msgstr ""
 msgid "file %s is on an unknown device\n"
 msgstr ""
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr ""
@@ -1600,47 +1595,42 @@ msgstr ""
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr ""
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr ""
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1695,179 +1685,170 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr ""
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr ""
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr ""
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr ""
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr ""
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2283,7 +2264,7 @@ msgstr ""
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr ""
 
@@ -2323,98 +2304,98 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr ""
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr ""
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
@@ -2515,197 +2496,173 @@ msgstr ""
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+msgid "rpmMkTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr ""
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr ""
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr ""
@@ -2730,105 +2687,120 @@ msgstr ""
 msgid "Upgrading packages..."
 msgstr ""
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr ""
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr ""
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr ""
+
+#: lib/rpmlead.c:103
+#, c-format
+msgid "%s: illegal signature type\n"
+msgstr ""
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr ""
@@ -2873,593 +2845,597 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr ""
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr ""
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr ""
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr ""
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr ""
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr ""
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr ""
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr ""
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr ""
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr ""
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 msgid " signature: "
 msgstr ""
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr ""
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr ""
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
@@ -3468,60 +3444,60 @@ msgstr ""
 msgid "Unknown system error"
 msgstr ""
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
@@ -3546,76 +3522,76 @@ msgstr ""
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr ""
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr ""
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr ""
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3636,383 +3612,369 @@ msgstr ""
 msgid "verify database files"
 msgstr ""
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, c-format
 msgid "closed   sql db         %s\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr ""
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr ""
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr ""
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr ""
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr ""
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr ""
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr ""
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr ""
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr ""
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr ""
 
@@ -4021,38 +3983,38 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index ef56f3674..4dd7dd430 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -12,51 +12,51 @@ msgstr ""
 "Date: 1999-04-03 12:20+0200\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "����������������� ����������� ������:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "������ �������� ����� ������������ %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "������ �������� ������ tar: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "������ ������ ����� ������������ �� %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "���������� ������������� %s � %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "���������� �������� ���������� � %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "�� ������� ����: %s.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "���� %s �� ����� �� ���� ������������.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "��������� ��� ������: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "������ ��� ��������� %s\n"
@@ -76,170 +76,170 @@ msgstr "������ ������ ��������� �� ������\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "���������� �������� ������� payload: %s\n"
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "��������� ������� (� -q ��� --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "��������� �������� (� -V ��� --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "��������� �������� (� -V ��� --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "��������� �������:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "��������� ���� ������"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "��������� ������ � [ <���� ������������> | <��� �����> | <�������� �����> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "��������� ���������/����������/��������:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "����� ��������� ��� ���� ������� � ����������� rpm:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ������ %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "��� ��������� ����� �������� �������������� �� �������� GNU GPL\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "���������� ������ ��� ��������� ���������� (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "����� ���� ������ ������ ���� �� �������� �������"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "�� ���� ��� ����� ���� �������� ������ ���� ��� �������� ��� �������"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "����������� ����� �������"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "����������� ������ �������"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "����������� �������� �������"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "��������������� ����� ���� ������ ���������, ����������, �������� ���������� "
 "� ����� ������������"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "����� ����� ���� ���������� ������ ��� ��������� ������"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "�������� --relocate � --excludepath ����� ������������ ������ ��� ��������� "
 "����� �������"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "������� --prefix ����� ������������ ������ ��� ��������� ����� �������"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "��������� ��� --prefix ������ ���������� � /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "����� ���� ����������� ������ ���� �� ���������� --excludedocs ��� --"
 "includedocs"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ����� ���� ������ ������ ��� �������� ������"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ����� ���� ������ ������ ��� ��������� ��� �������� ������"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -247,7 +247,7 @@ msgstr ""
 "��������� ������� ��������� ����� ���� ������� ������ ��� ��������� ��� "
 "�������� ������"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -255,7 +255,7 @@ msgstr ""
 "��������� ������� ��������� ����� ���� ������ ������ ��� ��������� ��� "
 "�������� ������(��)"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -263,14 +263,14 @@ msgstr ""
 "--nodeps ����� ���� ������ ������ ��� ������, ���������, �������� � �������� "
 "�������"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test ����� ���� ������ ������ ��� ���������, �������� � ������ ������"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -278,105 +278,105 @@ msgstr ""
 "--root (-r) ����� ���� ������� ������ ��� ���������, ��������, �������� "
 "������ � ������������ ���� ������"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "��������� ��� --root (-r) ������ ���������� � /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "��� ������ ��� �������\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "��� ������� � ����� %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp �� ������: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "������� �������� �����: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "�������� �������� �����\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "�������� ����� �������.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "�������� ������������ %%_signature � ����������.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign ����� ���� ����������� ������ ��� ������ �������"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "������ �� ������\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "�� ������ ������ ��� ����������"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "�� ����� ���� ������������ ��� ������ ������"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "�� ������ tar-����� ��� ������ ������"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "�� ������ ������ ��� ��������"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "�� ������ ������ ��� ���������"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "�� ������ ��������� �������"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "�� ������ ��������� ��� �����������"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "�� ������ ���������"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "���������� ������� ��������� ����.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "�����������(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "��������� %s �� ������� (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "�������� ��� �������� �� %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -435,92 +435,92 @@ msgstr "&& � || �� �������������� ��� �����\n"
 msgid "syntax error in expression\n"
 msgstr "�������������� ������ � ���������\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "������ TIMECHECK: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "����������� '(' � %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "����������� ')' � %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "�������� ����� %s: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "����������� %s � %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "�� ������ ������� ����� %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "�������� ���������: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "�������� �����: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "�������� ����� �� ������� %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "��������� ����� locale: \"%.*s\" � %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "�������� locale %.*s � %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "����� ��� %%docdir ��������\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "������ ���� �������� ��� %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "��� ����� � ����� ������: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "���� ������ ���������� � \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "������ ��������� ����. %%doc � ������� �������: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "���� ������ ������: %s\n"
@@ -550,7 +550,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: ������ ������ �� ����� ��������������.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: ��� �� �������� ����.\n"
@@ -570,7 +570,7 @@ msgstr "���� ������ ���������� � \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Glob �� �����������: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "���� �� ������: %s\n"
@@ -580,7 +580,7 @@ msgstr "���� �� ������: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "���������� ������� ���� %%files %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "������: %s\n"
@@ -590,7 +590,7 @@ msgstr "������: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "�������� ���� %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�������� ���� ��������/������: %s\n"
@@ -614,181 +614,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "�������������� �����: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: ������� ����� uid\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: ������� ����� uid\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: ������� ����� ���������������� ���������������\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: ������� ����� gid\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: ������� ����� gid\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: ������� ����� ��������������� �����.\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "���������� �������������� ��� ����������: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "������ �������� ������ �� ����� %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "������ �������� ������: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy: ������ ������: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: ������ ������: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "���������� ������� ���� PreIn: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "���������� ������� ���� PreUn: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "���������� ������� ���� PostIn: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "���������� ������� ���� PostUn: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "���������� ������� ���� VerifyScript: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "���������� ������� ���� Trigger script: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: �������� %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: ������ %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ������ Fseek: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s  �� �������� ������� RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: �������� ��������� �� %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "���������� ��������� ��������� � ����������� ������� ������.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "���������� �������� ��������� ���������\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "�������� ������ CSA\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "���������� �������� ������������� ���������\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "������������ �������: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "���������� ������������� ��������� �������.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "���������� �������� �����: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "���������� ������� ���� ������� %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "���������� ��������� ��������� �� %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "���������� �������� ��������� � %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "���������� ��������� ���������� �� %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "���������� �������� ���������� � %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "�������: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "���������� ������� ��� ����� ��� ������ %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
@@ -798,32 +789,32 @@ msgstr "���������� ������� %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "������ %d: ������ %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "������ %%changelog ������ ���������� � *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "�������� ������ %%changelog\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "�������� ���� � %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog �� � ���������� ��������������� �������\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "��������� ��� � %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "��� �������� � %%changelog\n"
@@ -833,17 +824,17 @@ msgstr "��� �������� � %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "������ %d: ������ ������� %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "������ %d: �������� �������� %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "������ %d: ������� ����� ����: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "������ %d: ����� �� ����������: %s\n"
@@ -853,210 +844,210 @@ msgstr "������ %d: ����� �� ����������: %s\n"
 msgid "line %d: Second description\n"
 msgstr "������ %d: ������ ��������\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "������ %d: ������ ������� %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "������ %d: ������ ������ %%files\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "����������� ���������: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "����������� �� ��������: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "�� ���������: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "�� �� ��������: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "���� %s ������� �������������� � ������: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "������������� ������ %s � ������: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "���������� ������� ����������� %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "���������� ��������� ����������� %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "����������� ��� �����������: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "������ %d: ����� ������� ������ ���� ��������: %s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "������ %d: �������� ���: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "������ %d: ������ ���: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "������ %d: ������������ ������ '-' � %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot �� ����� ���� \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "������ %d: ������� �� ����� ������������� �� \"/\": %s\n"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "������ %d: Docdir ������ ���������� � '/': %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "������ %d: ���� Epoch/Serial ������ ���� ������: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "������ %d: �������� ����� %s: ����������: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "������ %d: �������� ������ BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "���������� ������: ����������� ����� %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "�������� ������������ ������: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "����� ��� ����������: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "������ %d: ����������� ���: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "���� spec �� ����� ������������ BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "�������� ��������: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "��� ������� ����� %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "��� ��������� ����� %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "�� ���� �������� nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "������ ������� %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "������ %d: �������� �������� ��� %%setup %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "������ %d: �������� �������� %%setup %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "������ %d: ��� %%patch -b ����� ��������: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "������ %d: ��� %%patch -z ����� ��������: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "������ %d: �������� �������� ��� %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "������ %d: ��� %%patch -p ����� ��������: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "������ %d: �������� �������� ��� %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "������� ����� ������!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "������ %d: �������� �������� ��� %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "������ %d: ������ %%prep\n"
@@ -1109,300 +1100,304 @@ msgstr "������ %d: ������ %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "������ %d: ������ ������� %%description: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "������ %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "���������� %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean ��� ��������: %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: ������ %%else ��� %%if\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: ������ %%endif ��� %%if\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "�������� ���������� %%include\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "�� ������� ����������� ����������� ��� ������.\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "����� �� ����� %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot ��� ������, %s ������������\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "��������� �� ������ %prep (���������� ��������� � �������� �������) �� <���� "
 "������������>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<���� ������������>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 "��������� �� ������ %build (%prep, ����� ����������) �� <���� ������������>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "��������� �� ������ %install (%prep, %build, ����� ���������) �� <���� "
 "������������>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "��������� ������ %files �� <���� ������������>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "������� �������� � �������� ������ �� <���� ������������>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "������� �������� ����� �� <���� ������������>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "������� �������� ����� �� <����� ������������>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "��������� �� ������ %prep (���������� ��������� � �������� �������) �� "
 "<����� tar>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<����� tar>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "��������� �� ������ %build (%prep, ����� ����������) �� <����� tar>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "��������� �� ������ %install (%prep, %build, ����� ���������) �� <����� tar>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "��������� ������ %files �� <����� tar>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "������� �������� � �������� ������ �� <����� tar>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "������� �������� ����� �� <����� tar>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "������� �������� ����� �� <����� tar>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "������� �������� ����� �� <�������� �����>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<�������� �����>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "��������� �� ������ %install (%prep, %build, ����� ���������)  �� <�������� "
 "�����>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "�������������� build root"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "����� ���������� ������� ������ ����������"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "������� ���������, ����������� � �������� rpm4"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "������������ ExcludeArch: � ����� ������������"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "������� ������ ��������� ������"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "�� ��������� ������� ������ ������"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "�� ��������� ����������� ������ ����� �������"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "������� ���������(��) ������, ����������� � (�����������)  ��������� rpm[23]"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "�� ��������� �������� ������(��)"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "�� ��������� ���������, ����������� �� ���� ������"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "�� ��������� �������(�) � ������(��)"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "������������ ������ i18N �� ����� ������������"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "����� ���������� ������� ���������"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "����� ���������� ������� ���� ������������"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "������� ��������������� � ���������� ����� (������ ��� c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "������������ PGP/GPG-�������"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "�������������� ������� ���������"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "������ ������ I18N � �������� ����� ������������"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "������� ���������, ����������� � (�����������) �������� rpm[23]"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "���������� ��������� %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "���� ��������� %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, fuzzy, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr "%s: waitpid(%d) rc %d status %x\n"
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s �� �������\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "������ ���� ������ � %s �� �������\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s ������ �������� �������� %s: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "���� �����  %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "���������� ����� %s:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "������ %d: �������� �����: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "������ %d: �������� ����� no%s: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "������ %d: �������� ����� %s: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "���������� ��������� %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "������ ����� ������������ %s �� ������, ���������� ��������� ����\n"
@@ -1448,52 +1443,52 @@ msgstr "���� ������ �� ������ � ��������� ������"
 msgid " failed - "
 msgstr "�� ������� - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "����� %s ��� ��� ��������, ���������� %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "����� %s ��� ��� ��������, ���������� %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(���������)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib provides)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(db files)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(db provides)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "������������ ����������(�) �ͣ� ������(��) [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "��������� %s \"%s\" �� ������������� ������.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== ������ ������������� ������������\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1502,26 +1497,26 @@ msgstr ""
 "========== ���������� ������� (�����������, #predecessors, #succesors, "
 "������, �������)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== ������ ������������� (� ������� �������������)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "����:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== ����������� ������������ ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "������ rpmtsOrder, �������� %d ���������\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(�� �����)"
 
@@ -1533,16 +1528,16 @@ msgstr "(�� base64)"
 msgid "(invalid type)"
 msgstr "(������������ ���)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(not a blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 #, fuzzy
 msgid "(invalid xml type)"
 msgstr "(������������ ���)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(�� ������� ������� OpenPGP)"
 
@@ -1561,7 +1556,7 @@ msgstr "mntctl() �� ��������� �������� ������� fugger: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "���������� �������� ���������� � %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
@@ -1576,12 +1571,12 @@ msgstr "����%5d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "���� %s - �� ����������� ����������\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========= ��������, ������� �� �������� � ����� ����:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1636,47 +1631,42 @@ msgstr "%s ���������� ������� %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s ������ ��� %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "����������� %d ������� � ������ %s\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "���������� ������� %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "���������� ������ � %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "������ �������� ���������� ����� %s\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1731,185 +1721,176 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "������ ������ 1 �� �������������� ���� ������� RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "��� ������ RPM ������������ ������ ������ ������ <= 4\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: ������ rpmReadSignature\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ������� ����������\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: ������ headerRead\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ������ Fread: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s �� ����� ���� ����������\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "�� ������ ��������"
 
-#: lib/poptALL.c:176
+#: lib/poptALL.c:177
 #, fuzzy
-msgid "FTS_NOSTAT: don't get stat info"
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "�� ����������� ���������� � ������"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:183
 #, fuzzy
-msgid "FTS_XDEV: don't cross devices"
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "�� ���������� ������� �������� ������"
 
-#: lib/poptALL.c:184
+#: lib/poptALL.c:185
 #, fuzzy
-msgid "FTS_WHITEOUT: return whiteout information"
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "�� ���������� ����������"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "������������� MACRO �� ��������� EXPR"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "���������� MACRO �� ��������� EXPR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "������� �������� ������� EXPR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "������������ <FILE:...> ������ �����(��) �� ���������"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "��������� ������������� libio(3) API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "������� ����������� ����� � CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "������������ ROOT ��� �������� �������"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "���������� ��������� ����� �������"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "�������� ������� �������� rpmrc � ��������"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "�������� ������� ���������"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "�������� ����� ��������� ���������"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "������� ����� ������ ���� ��������"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "������� ������ ��������� �������������� ������ "
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "������� ������ ��������� �������������� ������ "
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "������� ��������� ����������/����������"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "������� ������ ��������� �������"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "������� ������ ��������� �������"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "������� �������� �����/������ rpmio"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "������� ��������� URL ���"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: ������� ���������� ����������� ��������� (%d)\n"
@@ -2342,7 +2323,7 @@ msgstr "�� ��������� ����� ������"
 msgid "don't verify files in package"
 msgstr "�� ��������� ����� ������"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "�� ��������� ����������� ������"
 
@@ -2383,98 +2364,98 @@ msgstr "��������� ����� (�� �� ����� ��� --addsign)"
 msgid "generate signature"
 msgstr "������������ �������"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "��������� �������� ����� ������ ���������� ���������\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "�������� ����� �� �������� ����� ������������\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rc %d status %x\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s) %s������ ����������� ��������\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s) ������������ ������ \"%s\".\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s) %s������ ����������� ��������\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s) ������ ��������, waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s) ������ ���������� ��������, ��� �������� %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s) ������ ���������� ��������, ��� �������� %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s �������� %d ������, ��������� ��������: %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s ������ �������� (%d), ������������ %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "���������� ������������� ��������� �������\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "���������� ������ �� �������%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " �� ����� "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ������ �� ����� %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s �� �������: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "������ � �������: %s\n"
@@ -2575,126 +2556,107 @@ msgstr "����� ������ ������: %u\n"
 msgid "record %u could not be read\n"
 msgstr "���������� ��������� ������ %u\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "����� %s �� ����������\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(����� ���������)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(added provide)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ������ ��������: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "������ makeTempFile\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: ������ Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: ������ Fseek: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: ��� �� ����� RPM\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: �� ���� ��������� ������ v1\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: �� ���� ������������� ������ v2\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: ��� ��� �������� ���ޣ� � �������������� %s, ������������\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ������ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ������ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: ������ ������ �� ����� ��������������.\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: ������ ��������������.\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: ������ headerRead\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: ������ headerGetEntry\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: ������� ��� (RPM v1.0)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "�� ��"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (����������� �����:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (��� ������� � ������:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "��"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "��T"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "��"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2704,71 +2666,67 @@ msgstr ""
 "\"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "����� %s �������� ����������������� %s: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s �������� ��-�� ����� missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== �����������\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d �������� %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ����������� %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "����������� %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "������������ %s � %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "������������ ������� %s � %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "����������� ���"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "����������������� �����������:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    ������������ ����������:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "����������..."
@@ -2793,105 +2751,120 @@ msgstr "����������..."
 msgid "Upgrading packages..."
 msgstr "���������� �������..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "����������� ����: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "����������� %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... ��� %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ������������ - ������ �������� - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s �� ����� ���� ����������\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<�������� �����>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "����� %s - �� ������������\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "������������ �������� ������\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "������ ������ �� ����� %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "��� ����� %s ���������� ����� ����� ������ RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: �� ����� (��� �������� ������) rpm : %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "������� %d �������� � %d �������� �������\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "������������ �������� ������\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "���������� ������� ���� %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ������ ��������� �������\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "��������������� %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "����� ������� (+%d/-%d) �� %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "����������� %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: ��� �� ����� RPM\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: ������� ����������\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "������ ������: %s (%d)\n"
@@ -2938,599 +2911,603 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- �� �������������� ��� �����\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "���������� �������� ���������� %s �� %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "���������"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "����� %s ������������ ��� ����������� %s"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "����� %s ������������ ��� ������������ ������� %s"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "����� %s ��� ����������"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "���� %s � ������ %s - �� ������������"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "�������� ����� %s ��� �������� ��������� %s � %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "���� %s �� ���������������� ������ %s ����������� � ������ �� ������ %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "����� %s (������� �����, ��� %s) ��� ����������"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "��� ��������� ������ %s ����� %ld%c ���� �� �������� ������� %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "��� ��������� ������ %s ����� %ld inodes �� �������� ������� %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s ����� ��� %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(����������)"
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s ����������� �%s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "����������� ������ %d ��� ������ � ������� %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "����������� ������ ':' � %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "����������� �������� ����������� � %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "�������� ������ ������ � %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "������� ����� ���������� � ������ ������ � %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "�������� ����� arch/os: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "�������� ������ �� ��������� � %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "������� ����� ���������� � ������ �� ��������� � %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "���������� �������� %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "����������� ':' (������ 0x%02x) � %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "����������� �������� ��� %s � %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "������ ��������� %s �� %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "���������� ������� %s � %s:%d %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "����������� ����������� ��� %s � %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "�������� �������� '%s' � %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "���������� �������� %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "���������� ��������� %s, �������� HOME ������� ������.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "���������� ������� %s ��� ������: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "�� ���� ������� ���� ������ Packages � %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "�������� ����� ������: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "����������� '(' � %s %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "�������� ����� ������: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "���������� ������� ���� ������ ���������� ������������ � %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "�����������: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "������������: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    ������������ ����������:\n"
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "�������� ������ �������������� �������� ������\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "����%5d: %07o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "������������ %s � %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "��������� ������: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "����������� ������: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "�������: ������(%d)+����������(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "���������� ��������� %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "������ pgp\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "������ pgp ��� ������ �������\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "������ ������� PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "���������� �������� �������\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "�������� %d ���� ������� PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "������ �� ������\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "������ gpg ��� ������ �������\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "������ ������� GPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "�������� %d ���� ������� GPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "�������� ������������ %%_signature � ����������\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "�� ������ ���������� \"%%_gpg_name\" � ����� ����������\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "�� ������ ���������� \"%%_pgp_name\" � ����� ����������\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "������ ��������� � �����������:"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "�������� MD5:"
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "�������� SHA1 ���������:"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "��������� "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "������� DSA V3: "
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "������� DSA V3: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "�������� �������: ������������ ���������\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "�����. ����� MD5 ����������: �� ��������������\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "�������: ���������� (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "����������� ������� %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "��������� �������� ����� ������ ���������� ���������\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "�� ���� ����� �� �������� � %s: %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<�������� �����>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<�������� �����>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "������ ������ ��������� �� ������\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, fuzzy, c-format
 msgid "sanity checking %d elements\n"
 msgstr "����e������ %d ���������\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "�������������� ���������(��) %d �����(��)\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "�������������� ���������� ������\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "�����������   %c %s"
@@ -3540,60 +3517,60 @@ msgstr "�����������   %c %s"
 msgid "Unknown system error"
 msgstr "����������� �������: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "������(%d) db%d �� %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "������(%d) db%d: %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "������� ��������� ���� ������ %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "������� ��������� ���� ������ %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "����������� ��������� ���� ������ %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "������ ������ ���� ������ %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "�������� ������ ���� ������ %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "����������� ������ ���� ������ %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "���������� �������� ���������� %s �� %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "��������������"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "�����������"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "������������ ������ ���� ������ %s/%s\n"
@@ -3619,76 +3596,76 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 "%s ����� ������� ����� ��� ������� ������� �������� integer, ���������\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "����������� \"{\" ����� \"%\""
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "����������� \"}\" ����� \"%{\""
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "������ ������ ����"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "������ ��� ����"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "����������� ���"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "� ����� ������� ��������� \"]\""
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "����������� \"]\""
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "����������� \"}\""
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "� ��������� ��������� \"?\""
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "� ��������� ����� \"?\" ��������� \"{\""
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "� ��������� ��������� \"}\""
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "� ��������� ����� \"?\" ��������� \":\""
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "� ��������� ����� \":\" ��������� \"{\""
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "� ����� ��������� �������� \"|\""
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3711,387 +3688,373 @@ msgstr ""
 msgid "verify database files"
 msgstr "��������� ����� ���� ������"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "������� ���������, ����������� � (�����������) �������� rpm[23]"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: ��� ����� \"%s\" �� ��������, ������������\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "���������� ������� ������ %s ��������� db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "���������� ������� ������ %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "��������� dbpath �� ����������\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "������(%d) ��������� ������� \"%s\" �� ������� %s\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 #, fuzzy
 msgid "miFreeHeader: skipping"
 msgstr "rpmdb: ������������"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "������ (%d) ���������� ������ #%d � %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 #, fuzzy
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdb: ������������"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: ������� ������������ ��������� #%u -- ������������.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ���������� �������� ��������� � 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "������(%d) ���������� ������ ���������  #%d ��� �������� %s\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "��������� \"%s\" �� ������� %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "��������� %d ������� �� ������� %s.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "������(%d) ��������� \"%s\" ������� �� ������� %s\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "������(%d) ���������� ������ \"%s\" � %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "������(%d) �������� ������ %s �� %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "������(%d) �������������� ������ ��� ������ ������ ������\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: ������������"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "����������� \"%s\" � ������ %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "����������� %d ������� � ������ %s\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "������(%d) ������ ������ %s � %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "��������� %s ����� ��������� ���������� ������������� ���� � db3.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "��������� dbpath �� ����������"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "��������������� ���� ������ %s � %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "��������� ���� ������ %s ��� ����������\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "��������� ������� %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "��������� ������� %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "����������� ������ ���� ������ ����� dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "����������� ����� ���� ������ ����� dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "��������� ����� %u � ���� ������ �������� -- ������������.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "���������� �������� ������ (������������� � %u)\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "������������ ���� ������ �� �������, ������ ���� ������ �������� �� �����\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "���������� �������� ������ ���� ������ �� �����!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "����� � %s ���������� ������� �� %s ��� ��������������"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "��������� ������� %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "������ �������� �������� %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "������ ������ ���� ������ %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "����������� ������ ���� ������ %s/%s %s mode=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "====================== �������� %d ������ %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(�����)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(�����)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "������������ �������� ������\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "���������� ������ %%%s\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "������������ ��� (%%define) ������� %%%s\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "���������� ��������� � ������� %%%s\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "������ %%%s ����\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "���������� �������� ������ %%%s\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "������������ ��� (%%undefine) ������� %%%s\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "������ %%%s (%s) �� ��� ����������� ���� ������ %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "����������� �������� %c � %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "������� ��������(%d) ������ ����������(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "���������� %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "���������� ������ ����� %%\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "������ %%%.*s �� ������, ���������\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "���� %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "����� ����� %s ������ ��� %u ����\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- �� �������������� ��� �����\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: ������ Fwrite: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "�������� ����� ������: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: ������ Fseek: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "���������"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "�������� ����� �������"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "������ �����/������ �������"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "������� �������"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "�� ���� ����� ����� �������"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "�� ���� ����� ��� �������"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "�� ���� ����������� � ��������"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "�� ���� ���������� ���������� ��� ������ � ��������"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "�������� ������ �����/������"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "������ ��� �������� ���������� ������� � ��������� �����"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "���� �� ������ �� �������"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "������ � ��������"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "����������� ��� ����������� ������"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "������ ������: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(��� ������)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "��������� ������: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "������: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "��������������: "
 
@@ -4100,42 +4063,74 @@ msgstr "��������������: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "memory alloc (%u bytes) returned NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url ���� ������ ���� ������\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "�� ��������� ������� ���������� � �����������"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr "�� ��������� ��� ���� ������. ������ ������� ���� ������."
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "��������� �������:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: ������ %%{_cache_dbpath} ����������� ������̣�.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ������ ������ � ���: ��� ������ %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ������ ������ ������ ������: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: ������ %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "���������� �������� ������������� ���������\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "������ �������� ���������� ����� %s\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "������ ������ 1 �� �������������� ���� ������� RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr "��� ������ RPM ������������ ������ ������ ������ <= 4\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: �� ���� ��������� ������ v1\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: �� ���� ������������� ������ v2\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: ������� ��� (RPM v1.0)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "���� %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "����� ����� %s ������ ��� %u ����\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "����������������� ����������� ��� %s: "
diff --git a/po/sk.po b/po/sk.po
index bb59662fc..f15eb10e3 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -10,52 +10,52 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "nevyrie�en� z�vislosti:\n"
 
-#: build.c:59
+#: build.c:60
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nie je mo�n� otvori� spec s�bor: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Otvorenie r�ry pre tar zlyhalo: %s\n"
 
-#: build.c:155
+#: build.c:156
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Nie je mo�n� pre��ta� spec s�bor z %s\n"
 
-#: build.c:183
+#: build.c:184
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Nie je mo�n� premenova� %s na %s: %s\n"
 
-#: build.c:229
+#: build.c:230
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "nepodarilo sa zisti� stav %s: %s"
 
-#: build.c:234
+#: build.c:235
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "S�bor nie je oby�ajn� s�bor: %s\n"
 
-#: build.c:243
+#: build.c:244
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s zrejme nie je RPM bal�k\n"
 
-#: build.c:313
+#: build.c:314
 #, fuzzy, c-format
 msgid "Building target platforms: %s\n"
 msgstr "predefinova� cie�ov� platformu"
 
-#: build.c:328
+#: build.c:329
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "vyh�ad�va sa bal�k %s\n"
@@ -75,182 +75,182 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr ""
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 #, fuzzy
 msgid "Signature options:"
 msgstr "Ve�kos� podpisu:   %d\n"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "s�bor %s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzia %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Program m��e by� vo�ne redistribuovan� v s�lade s podmienkami GNU GPL"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Vn�torn� chyba pri spracovan� argumentu (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "m��e by� pou�it� iba jeden hlavn� re�im"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "iba in�tal�cia, aktualiz�cia a odstr�nenie zdrojov m��u by� vyn�ten�"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 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:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 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:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia za��na� znakom /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 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:425
+#: rpmqv.c:420
 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:429
+#: rpmqv.c:424
 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:433
+#: rpmqv.c:428
 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:437
+#: rpmqv.c:432
 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:441
+#: rpmqv.c:436
 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:445
+#: rpmqv.c:440
 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:449
+#: rpmqv.c:444
 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:454
+#: rpmqv.c:449
 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:458
+#: rpmqv.c:453
 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:462
+#: rpmqv.c:457
 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:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 #, 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:477
+#: rpmqv.c:472
 #, 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:481
+#: rpmqv.c:476
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -259,7 +259,7 @@ msgstr ""
 "--nodeps m��e by� pou�it� iba po�as in�tal�cie, odstr�nenia alebo overenia "
 "bal�ka"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -267,7 +267,7 @@ msgstr ""
 "--test m��e by� pou�it� iba po�as in�tal�cie, odstr�nenia alebo zostavenia "
 "bal�ka"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -275,108 +275,108 @@ 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:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia za��na� znakom /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "nie je mo�n� pracova� so s�borom %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp nebolo n�jden�: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Chybn� �pecifik�cia %%_signature v makro-s�bore.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign m��e by� pou��t� iba po�as zostavenia bal�ka"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "neboli zadan� �iadne bal�ky pre znovuzostavenie"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "neboli zadan� �iadne spec-s�bory pre zostavenie"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "neboli zadan� �iadne tar-s�bory pre zostavenie"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "neboli zadan� �iadne argumenty pre overenie"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie je mo�n� otvori� do�asn� s�bor"
 
-#: build/build.c:208
+#: build/build.c:206
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Vykon�va sa: %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Vykonanie %s zlyhalo (%s)"
 
-#: build/build.c:223
+#: build/build.c:221
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Chybn� v�stupn� k�d z %s (%s)"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -444,92 +444,92 @@ msgstr "&& a || nie s� podporovan� pre re�azce"
 msgid "syntax error in expression\n"
 msgstr "chyba syntaxe vo v�raze"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "chyba PREKRO�ENIA �ASU: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "ch�baj�ce    %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "ch�baj�ca ':' na %s:%d"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Chybn� %s prvok: %s"
 
-#: build/files.c:462
+#: build/files.c:461
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "ch�baj�ce    %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:552
+#: build/files.c:551
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Chybn� %s() syntax: %s"
 
-#: build/files.c:562
+#: build/files.c:561
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Chybn� �pecifik�cia pr�v %s(): %s"
 
-#: build/files.c:574
+#: build/files.c:573
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Chybn� �pecifik�cia pr�v adres�ra %s(): %s"
 
-#: build/files.c:722
+#: build/files.c:721
 #, fuzzy, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Iba jeden z�znam v %%lang(): %s"
 
-#: build/files.c:733
+#: build/files.c:732
 #, fuzzy, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Iba jeden z�znam v %%lang(): %s"
 
-#: build/files.c:848
+#: build/files.c:847
 #, fuzzy, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Dosiahnut� limit pre %%docdir"
 
-#: build/files.c:856
+#: build/files.c:855
 #, fuzzy, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Iba jeden argument pre %%docdir"
 
-#: build/files.c:887
+#: build/files.c:886
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dva s�bory na riadku: %s"
 
-#: build/files.c:905
+#: build/files.c:904
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "S�bory musia za��na� znakom \"/\": %s"
 
-#: build/files.c:917
+#: build/files.c:916
 #, fuzzy, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie je mo�n� mie�a� �peci�lne %%doc s in�mi formami: %s"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "S�bor zadan� dvakr�t: %s."
@@ -559,7 +559,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -579,7 +579,7 @@ msgstr "S�bor potrebuje na za�iatku \"/\": %s"
 msgid "Glob not permitted: %s\n"
 msgstr "riadok %d: V %s s� vy�adovan� verzie: %s"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "S�bor nebol n�jden�: %s"
@@ -589,7 +589,7 @@ msgstr "S�bor nebol n�jden�: %s"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "chybe: nie je mo�n� otvori� %%files s�bor: %s"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "riadok: %s"
@@ -599,7 +599,7 @@ msgstr "riadok: %s"
 msgid "Bad file: %s: %s\n"
 msgstr "s�bor %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Chybn� vlastn�k/skupina: %s\n"
@@ -621,186 +621,176 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Spracov�vaj� sa s�bory: %s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nie je mo�n� kanonizova� n�zov po��ta�a: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "vytvorenie arch�vu zlyhalo pri s�bore %s: %s"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "vytvorenie arch�vu zlyhalo pri s�bore %s: %s"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy z�pis zlyhal: %s"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy ��tanie zlyhalo: %s"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nie je mo�n� otvori� PreIn s�bor: %s"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nie je mo�n� otvori� PreUn s�bor: %s"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nie je mo�n� otvori� PostIn s�bor: %s"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nie je mo�n� otvori� PostUn s�bor: %s"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nie je mo�n� otvori� VerifyScript s�bor: %s"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nie je mo�n� otvori� Trigger skriptov� s�bor: %s"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otvorenie %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: ��tanie %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie je RPM bal�k\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ��tanie hlavi�ky %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie je mo�n� zap�sa� %s"
 
-#: build/pack.c:488
+#: build/pack.c:435
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Chybn� CSA d�ta"
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "Nie je mo�n� zap�sa� %s"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Vytv�ra sa PGP podpis: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je mo�n� zap�sa� bal�k: %s"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie je pre��ta� sigtarget: %s"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie je mo�n� zap�sa� bal�k: %s"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je mo�n� zap�sa� bal�k: %s"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zap�san�: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie je mo�n� vytvori� meno v�stupn�ho s�boru pre bal�k %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je mo�n� zap�sa� do %s: "
@@ -810,32 +800,32 @@ msgstr "nie je mo�n� zap�sa� do %s: "
 msgid "line %d: second %s\n"
 msgstr "riadok %d: druh� %s"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, fuzzy, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "%%changelog z�znamy musia za��na� *"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, fuzzy, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "nekompletn� %%changelog z�znam"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, fuzzy, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "chybn� d�tum v %%changelog: %s "
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, fuzzy, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog nie s� v zostupnom chronologickom porad�"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, fuzzy, c-format
 msgid "missing name in %%changelog\n"
 msgstr "ch�baj�ce meno v %%changelog"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, fuzzy, c-format
 msgid "no description in %%changelog\n"
 msgstr "�iadny popis v %%changelog"
@@ -845,17 +835,17 @@ msgstr "�iadny popis v %%changelog"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "riadok %d: Chyba pri anal�ze %%description: %s"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "riadok %d: Chybn� vo�ba %s: %s"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "riadok %d: Prive�a n�zvov: %s"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "riadok %d: Bal�k neexistuje: %s"
@@ -865,212 +855,212 @@ msgstr "riadok %d: Bal�k neexistuje: %s"
 msgid "line %d: Second description\n"
 msgstr "riadok %d: Druh� popis"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, fuzzy, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "riadok %d: Chyba pri anal�ze %%files: %s"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, fuzzy, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "riadok %d: Druh� %%files zoznam"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, fuzzy, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architekt�ra je vynechan�: %s"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, fuzzy, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architekt�ra nie je obsiahnut�: %s"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS je vynechan�: %s"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS nie je obsiahnut�: %s"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "V bal�ku mus� existova� pole %s: %s"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Duplicitn� z�znamy %s v bal�ku: %s"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Nezn�my typ ikony: %s"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "riadok %d: Chybn� vo�ba %s: %s"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "riadok %d: Znetvoren� popis: %s"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "riadok %d: Pr�zdny popis: %s"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "riadok %d: Nepr�pustn� znak '-' v %s: %s"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "riadok %d: BuildRoot nem��e by� \"/\": %s"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "riadok %d: Prefixy nesm� kon�i� \"/\": %s"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "riadok %d: Docdir mus� za��na� '/': %s"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "riadok %d: Epoch/Serial pole mus� by� ��slo: %s"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "riadok %d: Chybn� %s ��slo: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "riadok %d: Chybn� form�t BuildArchitecture: %s"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern� chyba: �udn� popis %d "
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Chybn� �pecifik�cia bal�ka: %s"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "Bal�k u� existuje: %s"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "riadok %d: Nezn�my popis: %s"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 #, fuzzy
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec s�bor nem��e pou�i� BuildRoot"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, fuzzy, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Chybn� zdroj %s: %s"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, fuzzy, c-format
 msgid "No patch number %d\n"
 msgstr "Neexistuje patch ��slo %d"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, fuzzy, c-format
 msgid "No source number %d\n"
 msgstr "Neexistuje zdroj ��slo %d"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Nebolo mo�n� prenies� nie-zdroj %s: %s"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, fuzzy, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Chyba pri anal�ze %%setup: %s"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "riadok %d: Chybn� argument pre %%setup %c: %s"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, fuzzy, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "riadok %d: Chybn� vo�ba pre %%setup %s: %s"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "riadok %d: %%patch -b potrebuje argument: %s"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "riadok %d: %%patch -z potrebuje argument: %s"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "riadok %d: Chybn� argument pre %%patch -p: %s"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "riadok %d: %%patch -p potrebuje argument: %s"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "riadok %d: Chybn� argument pre %%patch -p: %s"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 #, fuzzy
 msgid "Too many patches!\n"
 msgstr "Prive�a z�plat!"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "riadok %d: Chybn� argument pre %%patch: %s"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, fuzzy, c-format
 msgid "line %d: second %%prep\n"
 msgstr "riadok %d: druh� %%prep"
@@ -1121,309 +1111,313 @@ msgstr "riadok %d: Druh� %s"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "riadok %d: Chyba pri anal�ze %%description: %s"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "riadok %d: %s"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "otvorenie zlyhalo: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, fuzzy, c-format
 msgid "Unclosed %%if\n"
 msgstr "Neuzavret� %%if"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else bez if"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif bez if"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, fuzzy, c-format
 msgid "malformed %%include statement\n"
 msgstr "znetvoren� pr�kaz %%include"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "�iadne zostavite�n� architekt�ry"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Bal�k neobsahuje %%description: %s"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot u� bol zadan�"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, fuzzy, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "pr�prava (rozbali� zdrojov� s�bory a aplikova� z�platy)"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr ""
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 #, fuzzy
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "in�taluje sa zdrojov� bal�k\n"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, fuzzy, c-format
 msgid "verify %files section from <specfile>"
 msgstr "zdrojov� bal�k neobsahuje �iadny .spec s�bor"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 #, fuzzy
 msgid "build source and binary packages from <specfile>"
 msgstr "n�jden�ch %d zdrojov�ch a %d bin�rnych bal�kov\n"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 #, fuzzy
 msgid "build binary package only from <specfile>"
 msgstr "zdrojov� bal�k neobsahuje �iadny .spec s�bor"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 #, fuzzy
 msgid "build source package only from <specfile>"
 msgstr "zdrojov� bal�k neobsahuje �iadny .spec s�bor"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, fuzzy, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "pr�prava (rozbali� zdrojov� s�bory a aplikova� z�platy)"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr ""
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, fuzzy, c-format
 msgid "verify %files section from <tarball>"
 msgstr "zdrojov� bal�k neobsahuje �iadny .spec s�bor"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 #, fuzzy
 msgid "build source and binary packages from <tarball>"
 msgstr "n�jden�ch %d zdrojov�ch a %d bin�rnych bal�kov\n"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 #, fuzzy
 msgid "build binary package only from <tarball>"
 msgstr "n�jden�ch %d zdrojov�ch a %d bin�rnych bal�kov\n"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 #, fuzzy
 msgid "build source package only from <tarball>"
 msgstr "zostavi� bal�k pre OS/architekt�ru <os>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 #, fuzzy
 msgid "build binary package from <source package>"
 msgstr "bin�rny bal�k (pr�prava, kompil�cia, in�tal�cia, zabalenie)"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 #, fuzzy
 msgid "<source package>"
 msgstr "n�jden�ch %d bal�kov\n"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 #, fuzzy
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr "in�taluje sa zdrojov� bal�k\n"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "predefinova� adres�r pre zostavenie bal�ka"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "po ukon�en� odstr�ni� adres�r, v ktorom sa bal�k zostavoval"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr ""
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr ""
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 #, fuzzy
 msgid "debug file state machine"
 msgstr "chybn� stav s�boru: %s"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "nevykona� �iadne etapy zostavenia"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 #, fuzzy
 msgid "do not verify build dependencies"
 msgstr "neoverova� z�vislosti bal�ka"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "neoverova� z�vislosti bal�ka"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "neoverova� architekt�ru bal�ka"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "overi� podpis bal�ka"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 #, fuzzy
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "neakceptova� lokalizovan� re�azce zo spec-s�boru"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 #, fuzzy
 msgid "remove sources when done"
 msgstr "po ukon�en� odstr�ni� zdrojov� s�bory a spec-s�bor"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "po ukon�en� odstr�ni� zdrojov� s�bory a spec-s�bor"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "presko�i� priamo k ur�enej etape (iba pre c, i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "vytvori� PGP/GPG podpis"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "predefinova� cie�ov� platformu"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 #, fuzzy
 msgid "lookup i18N strings in specfile catalog"
 msgstr "pre preklad re�azcov pou�i� katal�g spr�v spec-s�borov"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie je mo�n� spusti� %s"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie je mo�n� vytvori� proces %s"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s zlyhalo"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "nepodarilo sa zap�sa� v�etky d�ta do %s"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "odstr�nenie %s zlyhalo: %s"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Zis�uj� sa po�adovan� vlastnosti...\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Nepodarilo sa zisti� poskytovan� vlastnosti"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "riadok %d: Chybn� ��slo: %s"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "riadok %d: Chybn� no%s ��slo: %d"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "riadok %d: Chybn� %s ��slo: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, 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"
@@ -1470,80 +1464,80 @@ msgstr ""
 msgid " failed - "
 msgstr " zlyhalo - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 #, fuzzy
 msgid "(db provides)"
 msgstr "Poskytuje:"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstra�uje sa index skup�n\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr ""
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(nie je ��slo)"
 
@@ -1556,16 +1550,16 @@ msgstr "(nie je ��slo)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(nie je ��slo)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "vynecha� ak�ko�vek PGP podpisy"
@@ -1585,7 +1579,7 @@ msgstr "mntctl() nevr�til ve�kos� fuggeru: %s"
 msgid "failed to stat %s: %s\n"
 msgstr "nepodarilo sa zisti� stav %s: %s"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nepodarilo sa otvori� %s: %s"
@@ -1600,11 +1594,11 @@ msgstr "S�bor %4d: 0%o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "s�bor %s sa nach�dza na nezn�mom zariaden�"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "riadok %d: %s"
@@ -1659,47 +1653,42 @@ msgstr "otvorenie %s zlyhalo\n"
 msgid "%s created as %s\n"
 msgstr "varovanie: %s vytvoren� ako %s"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "premenov�va sa %s na %s\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie je mo�n� zap�sa� do %s: "
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je mo�n� zap�sa� do %s: "
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, fuzzy, c-format
-msgid "error creating temporary file %s\n"
-msgstr "chyba pri vytv�ran� do�asn�ho s�boru %s"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1754,190 +1743,179 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-#, fuzzy
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "t�to verzia RPM podporuje iba bal�ky s hlavn�m ��slom <= 3"
-
-#: lib/package.c:726
-#, fuzzy
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "t�to verzia RPM podporuje iba bal�ky s hlavn�m ��slom <= 3"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispoz�cii\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s nie je mo�n� nain�talova�\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "vyp�sa� verziu pou��van�ho rpm"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "posla� �tandardn� v�stup do <pr�kazu>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "pou�i� <adres�r> ako adres�r najvy��ej �rovne"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "vyp�sa� verziu pou��van�ho rpm"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Vn�torn� chyba pri spracovan� argumentu (%d) :-(\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr ""
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2403,7 +2381,7 @@ msgstr "zobrazi� s�bory v bal�ku"
 msgid "don't verify files in package"
 msgstr "zobrazi� s�bory v bal�ku"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "neoverova� z�vislosti bal�ka"
@@ -2452,101 +2430,101 @@ msgstr "podp�sa� bal�k (zni�i� aktu�lny podpis)"
 msgid "generate signature"
 msgstr "vytvori� PGP/GPG podpis"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "o�ak�van� zdrojov� bal�k, n�jden� bin�rny"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojov� bal�k neobsahuje �iadny .spec s�bor"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "vykon�vaj� sa poin�tala�n� skripty (ak existuj�)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s vynechan� - prenos zlyhal - %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "bal�k: %s-%s-%s test s�borov = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie arch�vu zlyhalo%s%s: %s"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " pre s�bor "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori� %s: %s"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "chyba form�tu: %s\n"
@@ -2649,201 +2627,177 @@ msgstr "po�aduje sa z�znam ��slo %d\n"
 msgid "record %u could not be read\n"
 msgstr "z�znam %d nie je mo�n� pre��ta�\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otvorenie zlyhalo\n"
 
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
 #, fuzzy
-msgid "makeTempFile failed\n"
+msgid "rpmMkTempFile failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "argument nie je RPM bal�k\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Nie je mo�n� podp�sa� v1.0 RPM\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Nie je mo�n� znovu podp�sa� v2.0 RPM\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Podpis nie je k dispoz�cii (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (CH�BAJ�CE K���E):"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NED�VERUJE SA K���OM: "
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "V PORIADKU"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "po�iadavka bal�ka %s nie je uspokojen�: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechan� kv�li pr�znaku missingok\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vynechan�: %s"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "pres�va sa %s do %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynech�va sa %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "pres�va sa %s do %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "pres�va sa %s do %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "nezn�my tag"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "nevyrie�en� z�vislosti:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr ""
@@ -2871,105 +2825,120 @@ msgstr ""
 msgid "Upgrading packages..."
 msgstr "    --upgrade <s�bor_bal�ka>"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Zis�uj� sa po�adovan� vlastnosti...\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pren�a sa %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr "... ako %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s vynechan� - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie je mo�n� nain�talova�\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "n�jden�ch %d bal�kov\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "bin�rny bal�k v starom �t�le\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pri vytv�ran� do�asn�ho s�boru %s"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "�iadny z bal�kov nesp���a %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "n�jden�ch %d zdrojov�ch a %d bin�rnych bal�kov\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "in�taluj� sa bin�rne bal�ky\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie je mo�n� otvori� s�bor %s: %s"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" �pecifikuje viac bal�kov\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie je mo�n� otvori� %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "In�taluje sa %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Pren�a sa %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "argument nie je RPM bal�k\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Podpis nie je k dispoz�cii\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "��tanie zlyhalo: %s (%d)"
@@ -3015,606 +2984,610 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- nie je podporovan� pre re�azce"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "nie je mo�n� z�ska� %s z�mok pre datab�zu"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr ""
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " je vy�adovan� %s-%s-%s\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "nein�talovan� "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "ch�baj�ce druh� ':' na %s:%d"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "ch�ba n�zov architekt�ry na %s:%d"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ne�pln� riadok �dajov na %s:%d"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Prive�a argumentov v riadku �dajov na %s:%d"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Chybn� ��slo arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ne�pln� implicitn� riadok na %s:%d"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Prive�a argumentov v implicitnom riadku na %s:%d"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Nie je mo�n� pre��ta� %s: %s."
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "ch�baj�ca ':' na %s:%d"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "ch�baj�ci argument pre %s na %s:%d"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "expanzia %s zlyhala na %s:%d \"%s\""
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nie je mo�n� otvori� %s na %s:%d"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "ch�baj�ca architekt�ra pre %s na %s:%d"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "chybn� vo�ba '%s' na %s:%d"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Nezn�my syst�m: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Nie je mo�n� expandova� %s"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie je mo�n� otvori� %s pre ��tanie: %s."
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "chybn� ��slo bal�ku: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "ch�baj�ce    %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "chybn� ��slo bal�ku: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "riadok: %s"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "zdroje v: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "S�bor %4d: 0%o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "pres�va sa %s do %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Ve�kos� podpisu:   %d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Ve�kos� podpisu:   %d\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie je mo�n� spusti� %s"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp zlyhalo"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp sa nepodarilo zap�sa� podpis"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Ve�kos� PGP podpisu: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie je mo�n� pre��ta� podpis"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Pre��tan� PGP podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg sa nepodarilo zap�sa� podpis"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Ve�kos� GPG podpisu: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Pre��tan� GPG podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Chybn� �pecifik�cia %%_signature v makro-s�bore.\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, 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"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Mus�te nastavi� \"%%pgp_name\" vo va�om makro-s�bore"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Prive�k� hlavi�ka"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "zobrazi� s�bory v bal�ku"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "Podpis nie je k dispoz�cii\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "Podpis nie je k dispoz�cii\n"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "bal�k nem� skupinu\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "�iadny z bal�kov nesp���a %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "n�jden�ch %d bal�kov\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "n�jden�ch %d bal�kov\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "chyba pri ��tan� hlavi�ky bal�ka\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 #, fuzzy
 msgid "running pre-transaction scripts\n"
 msgstr "vykon�vaj� sa predin�tala�n� skripty (ak existuj�)\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 #, fuzzy
 msgid "running post-transaction scripts\n"
 msgstr "vykon�vaj� sa postdein�tala�n� skripty (ak existuj�)\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "ch�baj�ce    %s\n"
@@ -3624,60 +3597,60 @@ msgstr "ch�baj�ce    %s\n"
 msgid "Unknown system error"
 msgstr "Nezn�my syst�m: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, fuzzy, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "odstra�uje sa index s�borov pre %s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, fuzzy, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "odstra�uje sa index s�borov pre %s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, fuzzy, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "odstra�uje sa index s�borov pre %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "odstra�uje sa index s�borov pre %s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "odstra�uje sa index s�borov pre %s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "otv�ra sa datab�za s pr�vami 0x%x v %s\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nie je mo�n� z�ska� %s z�mok pre datab�zu"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "v�hradn�"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "zdie�an�"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "odstra�uje sa index s�borov pre %s\n"
@@ -3702,76 +3675,76 @@ msgstr ""
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "ch�baj�ce { po %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "ch�baj�ce } po %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "pr�zdny tag form�t"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "pr�zdne meno tagu"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "nezn�my tag"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] o�ak�van� na konci po�a"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "neo�ak�van� ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "neo�ak�van� }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? o�ak�van� vo v�raze"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ o�ak�van� po ? vo v�raze"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} o�ak�van� vo v�raze"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ": o�ak�van� po ? podv�raze"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ o�ak�van� po : vo v�raze"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| o�ak�ven� na konci v�razu"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3794,389 +3767,375 @@ msgstr "znovu vytvori� datab�zu z existuj�cej"
 msgid "verify database files"
 msgstr "op�ta� sa spec s�boru"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nie je mo�n� otvori� %s na %s:%d"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "nie je mo�n� otvori� %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "nebola nastaven� �iadna dbpath"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "chyba pri z�pise z�znamu %s do %s"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie je mo�n� pre��ta� hlavi�ku na %d pre vyh�adanie"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstra�uje sa index skup�n\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstra�uje sa index n�zvov\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba pri z�pise z�znamu %s do %s"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba pri odstra�ovan� z�znamu %s z %s"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba pri h�adan� bal�ka %s\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenov�va sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "premenov�va sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "chyba pri z�pise z�znamu %s do %s"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "nebola nastaven� �iadna dbpath"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytv�ra datab�za v adres�ri %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "do�asn� datab�za %s u� existuje"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otv�ra sa star� datab�za\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otv�ra sa nov� datab�za\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "z�znam ��slo %d v datab�ze je chybn� -- bol vynechan�"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie je mo�n� prida� z�znam p�vodne na %d"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori� datab�zu; zost�va p�vodn�\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi� star� datab�zu novou!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahrad� s�bory v %s s�bormi z %s kv�li obnove"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytv�ra sa adres�r %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstr�ni� adres�r %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "odstra�uje sa index s�borov pre %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "otv�ra sa datab�za s pr�vami 0x%x v %s\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== akt�vnych %d pr�zdnych %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(pr�zdne)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(pr�zdne)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "Preplnenie cie�ovej vyrovn�vacej pam�ti"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s obsahuje neukon�en� telo"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s obsahuje chybn� n�zov (%%define)"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s obsahuje neukon�en� vo�by"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s obsahuje pr�zdne telo"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s sa nepodarilo expandova�"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s obsahuje chybn� n�zov (%%undefine)"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) nebolo pou�it� pod �rov�ou %d "
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nezn�ma vo�ba %c v %s(%s)"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "H�bka rekurzie (%d) v��ia ako maxim�lna (%d)"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Neukon�en� %c: %s"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "bal�k %%%.*s nebol n�jden�, vynech�va sa"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, fuzzy, c-format
-msgid "File %s: %s\n"
-msgstr "S�bor %s: %s"
-
-#: rpmio/macro.c:1913
-#, fuzzy, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "S�bor %s je men�� ako %d bajtov"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- nie je podporovan� pre re�azce"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "chybn� ��slo bal�ku: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "�spech"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Chybn� odpove� servera"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 #, fuzzy
 msgid "Server I/O error"
 msgstr "Chyba vstupu/v�stupu servera"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Prekro�enie �asov�ho limitu servera"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Nie je mo�n� vyh�ada� adresu servera"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Nie je mo�n� vyh�ada� n�zov servera"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Pripojenie k serveru zlyhalo"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Vytvorenie d�tov�ho spojenia k serveru zlyhalo"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "Chyba vstupu/v�stupu lok�lneho s�boru"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pri nastaven� vzdialen�ho servera do pas�vneho re�imu"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "S�bor sa na serveri nenach�dza"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Zru�enie prebieha"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Nezn�ma alebo neo�ak�van� chyba"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "��tanie zlyhalo: %s (%d)"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 #, fuzzy
 msgid "(no error)"
 msgstr "(chyba 0x%x)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "fat�lna chyba: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "chyba: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "varovanie: "
 
@@ -4185,44 +4144,84 @@ msgstr "varovanie: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url port mus� by� ��slo\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori� %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "overi� podpis bal�ka"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Ve�kos� podpisu:   %d\n"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: otvorenie zlyhalo\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: ��tanie %s: %s\n"
+
+#, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Nie je mo�n� zap�sa� %s"
+
+#, fuzzy
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "chyba pri vytv�ran� do�asn�ho s�boru %s"
+
+#, fuzzy
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "t�to verzia RPM podporuje iba bal�ky s hlavn�m ��slom <= 3"
+
+#, fuzzy
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr "t�to verzia RPM podporuje iba bal�ky s hlavn�m ��slom <= 3"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Nie je mo�n� podp�sa� v1.0 RPM\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Nie je mo�n� znovu podp�sa� v2.0 RPM\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Podpis nie je k dispoz�cii (v1.0 RPM)\n"
+
+#, fuzzy
+#~ msgid "File %s: %s\n"
+#~ msgstr "S�bor %s: %s"
+
+#, fuzzy
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "S�bor %s je men�� ako %d bajtov"
+
 #, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Nevyrie�en� z�vislosti pre %s-%s-%s: "
diff --git a/po/sl.po b/po/sl.po
index 0f549f0f2..4bae25fe9 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -15,52 +15,52 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "izdelava soodvisnosti je bila neuspe�na:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Datoteke s specifikacijami %s ni mo�no odpreti: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Povezava s programom tar je bila neuspe�na: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Neuspe�no branje datoteke s specifikacijami iz %s"
 
-#: build.c:183
+#: build.c:184
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Preimenovanje %s v %s je bilo neuspe�no: %m"
 
-#: build.c:229
+#: build.c:230
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "status %s ni na voljo: %s"
 
-#: build.c:234
+#: build.c:235
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Datoteka ni obi�ajna datoteka: %s\n"
 
-#: build.c:243
+#: build.c:244
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Ne ka�e, da je %s datoteka s specifikacijami."
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
@@ -80,178 +80,178 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr ""
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 #, fuzzy
 msgid "Signature options:"
 msgstr "Dol�. podpisa : %d\n"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM razli�ica %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Ta program je dovoljeno razpe�evati pod pogoji navedenimi v GNU GPL."
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "izbran sme biti le en glavni na�in"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo en tip poizvedbe/preverjanja je mo�en naenkrat"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "nepri�akovane zastavice pri poizvedbi"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "nepri�akovana oblika poizvedbe"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "nepri�akovan izvor poizvedbe"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix se sme uporabiti le pri namestitvi"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo za�eti z /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "izbiri --excludedocs in --includedocs se medsebojno izklju�ujeta"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sme podan le ob namestitvi paketa"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sme biti podati le ob namestitvi paketa"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 #, 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:477
+#: rpmqv.c:472
 #, 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:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -259,14 +259,14 @@ msgstr ""
 "--nodeps sme biti podan le ob izgradnji, vnovi�ni izgradnji, prevajanju, "
 "namestitvi, odstranitvi ali preverjanju paketa"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -274,108 +274,108 @@ msgstr ""
 "--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
 "vnovi�ni izgradnji paketa"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo za�eti z /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "ni datotek, ki bi jih lahko podpisal\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "dostop do datoteke %s ni mo�en\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp manjka: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspe�no\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign sme biti podan le ob izgradnji paketa"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "izvajanje je bilo neuspe�no\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovi�no izgradnjo niso navedeni"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Za�asne datoteke ni mo�no odpreti"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Izvajanje(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Izvajanje %s je bilo neuspe�no (%s): %s"
 
-#: build/build.c:223
+#: build/build.c:221
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s javi neuspe�no izhodno kodo (%s)"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -443,92 +443,92 @@ msgstr "&& in || nista podprta za nize"
 msgid "syntax error in expression\n"
 msgstr "napaka v sklanji izraza"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK neuspe�en: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Manjkajo�i ,(` v %s %s"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Manjkajo�i ,)` v %s(%s"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Neveljaven �eton %s: %s"
 
-#: build/files.c:462
+#: build/files.c:461
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Manjkajo�i ,(` v %s %s"
 
-#: build/files.c:514
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Neprazen znak sledi %s(): %s"
 
-#: build/files.c:552
+#: build/files.c:551
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Nepravilna skladnja: %s(%s)"
 
-#: build/files.c:562
+#: build/files.c:561
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Nepravilno dolo�ilo na�ina: %s(%s)"
 
-#: build/files.c:574
+#: build/files.c:573
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Nepravilno dolo�ilo na�ina imenika: %s(%s)"
 
-#: build/files.c:722
+#: build/files.c:721
 #, fuzzy, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Nenavadna dol�ina za locale: \"%.s\" pri %%lang(%s)"
 
-#: build/files.c:733
+#: build/files.c:732
 #, fuzzy, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Podvojeni locale %.*s za %%lang(%s)"
 
-#: build/files.c:848
+#: build/files.c:847
 #, fuzzy, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Dosegli smo omejitev za %%docdir"
 
-#: build/files.c:856
+#: build/files.c:855
 #, fuzzy, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Za %%docdir je podan samo en argument"
 
-#: build/files.c:887
+#: build/files.c:886
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dve datoteki v eni vrstici: %s"
 
-#: build/files.c:905
+#: build/files.c:904
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Ime datoteke se mora za�eti z \"/\": %s"
 
-#: build/files.c:917
+#: build/files.c:916
 #, fuzzy, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Posebnih %%doc ni mo�no me�ati z ostalimi oblikami: %s"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Datoteka je navedena dvakrat: %s"
@@ -558,7 +558,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead je bil neuspe�en\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -578,7 +578,7 @@ msgstr "Datoteki manjka uvodni \"/\": %s"
 msgid "Glob not permitted: %s\n"
 msgstr "vrstica %d: Razli�ica ni dovoljena: %s"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteke ni mo�no najti z raz�iritvijo metaznakov v imenu: %s"
@@ -588,7 +588,7 @@ msgstr "Datoteke ni mo�no najti z raz�iritvijo metaznakov v imenu: %s"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Datoteke %s iz %%files ni mo�no odpreti: %s"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "vrstica: %s"
@@ -598,7 +598,7 @@ msgstr "vrstica: %s"
 msgid "Bad file: %s: %s\n"
 msgstr "Po�kodovana datoteka: %s: %s"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Neobstoje� lastnik/skupina: %s\n"
@@ -620,186 +620,176 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Obdeloavnje datotek: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Iskanje kanoni�nega imena gostitelja je bilo neuspe�no: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe�no: %s"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe�no: %s"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "pisanje cpio_copy neuspe�no: %s"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "branje cpio_copy neuspe�no: %s"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Datoteke PreIn ni mo�no odpreti: %s"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Datoteke PreUn ni mo�no odpreti: %s"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Datoteke PostIn ni mo�no odpreti: %s"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Datoteke PostUn ni mo�no odpreti: %s"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Datoteke VerifyScript ni mo�no odpreti: %s"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Skriptne datoteke Trigger ni mo�no odpreti: %s"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: odpiranje %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: branje %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ni paket tipa RPM\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ni mo�no zapisati paketa %s: %s"
 
-#: build/pack.c:488
+#: build/pack.c:435
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Po�kodovani podatki CSA"
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "Ni mo�no zapisati paketa %s: %s"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo�no odpreti %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni mo�no zapisati paketa: %s"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ciljnega podpisa %s ni mo�no odpreti: %s"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ni mo�no zapisati paketa %s: %s"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni mo�no zapisati paketa %s: %s"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Neuspe�no ustvarjanje izhodne datoteke za paket %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni mo�no ustvariti %s: %s\n"
@@ -809,32 +799,32 @@ msgstr "ni mo�no ustvariti %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "vrstica %d: %s sekund"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, fuzzy, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "vnosi %%changelog se morajo za�eti z *"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, fuzzy, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "nepopoln vnos %%changelog"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, fuzzy, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "V %%changelog je napa�en datum: %s"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, fuzzy, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog ni urejen v padajo�em �asovnem zaporedju"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, fuzzy, c-format
 msgid "missing name in %%changelog\n"
 msgstr "v %%changelog je manjkajo�e ime"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, fuzzy, c-format
 msgid "no description in %%changelog\n"
 msgstr "opis v %%changelog manjka"
@@ -844,17 +834,17 @@ msgstr "opis v %%changelog manjka"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "vrstica %d: Napaka pri raz�lembi v razdelku %%description: %s"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "vrstica %d: Napa�na izbira %s: %s"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "vrstica %d: Preve� imen: %s"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "vrstica %d: Paket ne obstaja: %s"
@@ -864,212 +854,212 @@ msgstr "vrstica %d: Paket ne obstaja: %s"
 msgid "line %d: Second description\n"
 msgstr "vrstica %d: Drugi opis"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, fuzzy, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "vrstica %d: Napaka pri raz�lembi v razdelku %%Files: %s"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, fuzzy, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "vrstica %d: Drugi seznam %%Files"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, fuzzy, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arhitektura je izklju�ena: %s"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, fuzzy, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arhitektura ni vklju�ena: %s"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS je izklju�en: %s"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS ni vklju�en: %s"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "polje %s mora v paketu obstajati: %s"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Podvojeni vnosi %s v paketu: %s"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Ikone %s ni mo�no odpreti: %s"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Neznan tip ikone: %s"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "vrstica %d: Napa�na izbira %s: %s"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "vrstica %d: Deformirana zna�ka: %s"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "vrstica %d: Prazna zna�ka: %s"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot ne more biti \"/\": %s"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, 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:575
+#: build/parsePreamble.c:573
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "vrstica %d: polje Epoch/Serial mora biti �tevilo: %s"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "vrstica %d: Okvarjeno �tevilo %s: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "vrstica %d: Napa�na oblika BuildArchitecture: %s"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Notranja napaka: Neprava zna�ka %d"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Nepravilno dolo�ilo paketa: %s"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket �e obstaja: %s"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "vrstica %d: Neznana zna�ka: %s"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 #, fuzzy
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Datoteka spec ne more uporabiti BuildRoot"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, fuzzy, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Napa�en izvor: %s: %s"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, fuzzy, c-format
 msgid "No patch number %d\n"
 msgstr "Popravek �t. %d manjka"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, fuzzy, c-format
 msgid "No source number %d\n"
 msgstr "Izvorna koda �t. %d manjka"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Ni mo�no prenesti nosource %s: %s"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, fuzzy, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Napaka pri raz�lembi %%setup: %s"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "vrstica %d: Nepravilen argument za %%setup %c: %s"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, fuzzy, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "vrstica %d: Nepravilna izbira %%setup %s: %s"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "vrstica %d: Manjka argument za %%patch -b: %s"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "vrstica %d: Manjka argument za %%patch -z: %s"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "vrstica %d: Nepravilen argument za %%patch -p: %s"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "vrstica %d: Manjka argument za %%patch -p: %s"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "vrstica %d: Nepravilen argument za %%patch -p: %s"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 #, fuzzy
 msgid "Too many patches!\n"
 msgstr "Preve� popravkov!"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "vrstica %d: Nepravilen argument za %%patch: %s"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, fuzzy, c-format
 msgid "line %d: second %%prep\n"
 msgstr "vrstica %d: drugi %%prep"
@@ -1122,310 +1112,314 @@ msgstr "vrstica %d: Drugi %s"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "vrstica %d: Napaka pri raz�lembi v razdelku %%description: %s"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "vrstica %d: %s"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ni mo�no odpreti %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, fuzzy, c-format
 msgid "Unclosed %%if\n"
 msgstr "Nezaklju�eni %%if"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, fuzzy, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean vrne %d"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, fuzzy, c-format
 msgid "malformed %%include statement\n"
 msgstr "Deformiran stavek %%include"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Arhitektura za izgradnjo ni prisotna"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "V paketu manjka %%description: %s"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot je �e dolo�en"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, fuzzy, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr ""
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 #, fuzzy
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "izgradnja prek stopnje %%prep iz datoteke s specifikacijami"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 #, fuzzy
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "izgradnja prek stopnje %%install iz datoteke s specifikacijami"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, fuzzy, c-format
 msgid "verify %files section from <specfile>"
 msgstr "preverjanje dela datoteke s specifikacijami %%files"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 #, fuzzy
 msgid "build source and binary packages from <specfile>"
 msgstr "izgradi izvorni in binarni paket iz datoteke s specifikacijami"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 #, fuzzy
 msgid "build binary package only from <specfile>"
 msgstr "izgradi binarni paket iz datoteke .spec"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 #, fuzzy
 msgid "build source package only from <specfile>"
 msgstr "izgradi izvorni paket iz datoteke .spec"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, fuzzy, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr ""
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 #, fuzzy
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "paket izgradi prek stopnje %%prep iz arhiva tar"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 #, fuzzy
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "paket izgradi prek stopnje %%install iz arhiva tar"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, fuzzy, c-format
 msgid "verify %files section from <tarball>"
 msgstr "preverjanje dela %%files iz arhiva tar"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 #, fuzzy
 msgid "build source and binary packages from <tarball>"
 msgstr "iz arhiva tar izgradi izvorni in binarni paket"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 #, fuzzy
 msgid "build binary package only from <tarball>"
 msgstr "iz arhiva tar izgradi binarni paket"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 #, fuzzy
 msgid "build source package only from <tarball>"
 msgstr "iz arhiva tar izgradi izvorni paket"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 #, fuzzy
 msgid "build binary package from <source package>"
 msgstr "binarni paket izgradi iz izvornega"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 #, fuzzy
 msgid "<source package>"
 msgstr "ni paketov\n"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 #, fuzzy
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr "izgradnja prek stopnje %%install iz izvornega paketa"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "brez upo�tevanja vrhnjega imenika izgradnje"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "po zaklju�ku drevo imenikov v katerih smo pakete gradili odstrani"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr ""
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr ""
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 #, fuzzy
 msgid "debug file state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "brez izvajanja katerekoli od stopenj izgradnje"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 #, fuzzy
 msgid "do not verify build dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "preveri podpis paketa(-ov)"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 #, fuzzy
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "brez sprejemanja internacionaliziranih katalogov iz datoteke spec"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "po zaklju�ku naj se izvorna koda izbri�e"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "po zaklju�ku odstrani datoteko s specifikacijami"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskok naravnost na dolo�eno stopnjo (samo za c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "izdelava podpisa PGP/GPG"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "brez upo�tevanja strojnega okolja ciljnega sistema"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 #, fuzzy
 msgid "lookup i18N strings in specfile catalog"
 msgstr "upo�tevanje internacionalizirana sporo�ila v katalogu spec"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ni mo�no izvesti %s: %s"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Vejitev %s ni mo�na: %s"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s neuspe�en"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "pisanje podatkov v %s je bilo neuspe�no"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe�no: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "odstranitev %s je bila neuspe�na: %s"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Iskanje  %s: (z uporabo %s)...\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Neuspe�no iskanje %s:"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "vrstica %d: Napa�no �tevilo: %s"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "vrstica %d: Napa�no �tevilo no%s: %d"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "vrstica %d: Napa�no �tevilo %s: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "ni mo�no poizvedeti o %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, 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"
@@ -1472,80 +1466,80 @@ msgstr ""
 msgid " failed - "
 msgstr " neuspe�no - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "paket %s-%s-%s je �e name��en"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s-%s-%s je �e name��en"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "po�kodovana zbirka podatkov %s"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr ""
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(ni �tevilo)"
 
@@ -1558,16 +1552,16 @@ msgstr "(ni �tevilo)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(ni �tevilo)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "presko�i vse podpise PGP"
@@ -1587,7 +1581,7 @@ msgstr "mntctl() ni uspe�no vrnila velikosti fugger: %s"
 msgid "failed to stat %s: %s\n"
 msgstr "status %s ni na voljo: %s"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspe�no odpiranje %s: %s\n"
@@ -1602,11 +1596,11 @@ msgstr "Datoteka: %4d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "datoteka %s se nahaja na neznani napravi"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "vrstica %d: %s"
@@ -1661,47 +1655,42 @@ msgstr "odpiranje %s je bilo neuspe�no: %s\n"
 msgid "%s created as %s\n"
 msgstr "opozorilo: %s ustvarjen kot %s"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "dodajanje vnosov 0 %s.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ni mo�no ustvariti %s: %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni mo�no"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, fuzzy, c-format
-msgid "error creating temporary file %s\n"
-msgstr "napaka pri ustvarjanju za�asne datoteke %s"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1756,190 +1745,179 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-#, fuzzy
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "ta razli�ica RPM podpira samo pakete z glavnim �tevilom razli�ice <= 3"
-
-#: lib/package.c:726
-#, fuzzy
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "ta razli�ica RPM podpira samo pakete z glavnim �tevilom razli�ice <=4"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature je bil neuspe�en\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead je bil neuspe�en\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s ni mo�no namestiti\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "uporabljana razli�ica rpm"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "standardni izhod preusmerjen na <ukaz>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "uporabi <imenik> za korenski imenik"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "prika�i znane zna�ke za poizvedovanje"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "prika�i kon�ni rpmrc in nastavitev makra"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "razli�ica rpm, ki jo uporabljate"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr ""
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2403,7 +2381,7 @@ msgstr "brez preverjanja datotek v paketu"
 msgid "don't verify files in package"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
@@ -2452,101 +2430,101 @@ msgstr "podpi�i paket(e) (trenutni podpis zavrzi)"
 msgid "generate signature"
 msgstr "izdelava podpisa PGP/GPG"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "pri�akovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "poganjanje ponamestitvenih skript (�e obstajajo)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "presko�eno - %s - prenos neuspe�en - %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "skript se ni uspe�no izvedel"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "skript se ni uspe�no izvedel"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Ikone %s ni mo�no prebrati: %s"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "raz�iritev arhiva je bilo neuspe�no%s%s: %s"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe�no odpiranje %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe�en"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "napaka v obliki: %s\n"
@@ -2649,129 +2627,110 @@ msgstr "�tevilka zapisa paketa: %d\n"
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni mo�no prebrati\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name��en\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "po�kodovana zbirka podatkov %s"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s DA (dodane ponudbe)\n"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: odpiranje je bilo neuspe�no: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile je bil neuspe�en\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: pisanje Fwrite je bilo neuspe�no: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "navedeni argument ni paket RPM\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Podpis RPM v1.0 ni mo�en\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Sprememba podpisa RPM v2.0 ni mo�na\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead je bil neuspe�en: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature je bilo neuspe�no: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: readLead je bil neuspe�en\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: readLead je bil neuspe�en\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead je bil neuspe�en\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead je bil neuspe�en\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJO�I KLJU�I:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJU�I:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "V REDU"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2780,72 +2739,68 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s presko�en zaradi manjkajo�e zastavice OK\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je izklju�en: %s"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "izklju�evanje datoteke %s%s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe�no: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "neznana zna�ka"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "neuspe�ne soodvisnosti:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr ""
@@ -2873,105 +2828,120 @@ msgstr ""
 msgid "Upgrading packages..."
 msgstr "    --upgrade <paket>      "
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Iskanje  %s: (z uporabo %s)...\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Prena�anje %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... kot %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "presko�eno - %s - prenos neuspe�en - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ni mo�no namestiti\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "ni paketov\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "paketa %s ni mo�no premakniti\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "binarni paket v starem zapisu\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "napaka pri branju iz datoteke %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "datoteka %s zahteva novej�o razli�ico RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "noben paket ne pro�i %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "name��anje binarnih paketov\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ni mo�no odpreti datoteke %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" dolo�a ve� paketov\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ni mo�no odpreti %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Name��anje %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Prena�anje %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "navedeni argument ni paket RPM\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Podpis ni na voljo\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "branje je bilo neuspe�no: %s (%d)"
@@ -3017,608 +2987,612 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- ni podprt za nize"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "ni mo�no zakleniti z %s datotek %s/%s\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "paket %s-%s-%s je za drug tip arhitekture"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "paket %s-%s-%s je za drug operacijski sistem"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paket %s-%s-%s je �e name��en"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "paketa %s ni mo�no prestaviti\n"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, fuzzy, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "datoteka %s name��ena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s (ki je novej�i kot %s-%s-%s) je �e name��en"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datote�nem sistemu %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, fuzzy, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " potrebuje %s-%s-%s\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "ni name��eno  "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " je v sporu z %s-%s-%s\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, fuzzy, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "manjka drugi ,:` v %s:%d"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manjkajo�e ime arhitekture v %s:%d"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Nepopolna podatkovna vrstica v %s:%d"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Preve� argumentov v podatkovni vrstici v %s:%d"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Okvarjena �tevilka arh./op.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Nepopolna privzeta vrstica v %s:%d"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Preve� argumentov v privzeti vrstici v %s:%d"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Neuspe�no branje %s: %s."
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "manjkajo�i ,:` (najden 0x%02x) v %s:%d"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manjkajo�i argument za %s v %s:%d"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "raz�iritev %s je bila neuspe�na v %s:%d \"%s\""
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "ni mo�no odpreti %s v %s:%d: %s"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manjkajo�a arhitektura za %s v %s:%d"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "nepravilna izbira ,%s` v %s:%d"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznan sistem: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Ni mo�no raz�iriti %s"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, fuzzy, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Ni mo�no prebrati %s, HOME je prevelik."
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s ni mo�no odpreti za branje: %s."
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "zbirko podatkov paketov ni mo�no odpreti v %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "neveljavna �tevilka paketa: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Manjkajo�i ,(` v %s %s"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "neveljavna �tevilka paketa: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "datoteke %s/packages.rpm ni mogo�no odpreti\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "vrstica: %s"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "izvori v: %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "zbiranje seznama priklopljenih datote�nih sistemov.\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "Datoteka: %4d: %07o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Dol�. podpisa : %d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Dol�. podpisa : %d\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ni mo�no izvesti %s: %s"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp je bil neuspe�en"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp je bil neuspe�en pri zapisu podpisa"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dol�. podpisa PGP: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "branje podpisa je bilo neuspe�no"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prebrano %d bajtov podpisa PGP\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "izvajanje je bilo neuspe�no\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg je boil neuspe�en pri zapisu podpisa"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dol�. podpisa GnuPG: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Glava je predolga"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol�. polnila : %d\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izklju�evanje imenika %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "paket ne vsebuje skupine\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "noben paket ne pro�i %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "ni paketov\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "ni paketov\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "napaka pri branju glave paketa\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 #, fuzzy
 msgid "running pre-transaction scripts\n"
 msgstr "poganjanje prednamestitvenih skript (�e obstajajo)\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 #, fuzzy
 msgid "running post-transaction scripts\n"
 msgstr "poganjanje poodnamestitvenih skriptov (�e obstajajo)\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "manjka     %s\n"
@@ -3628,60 +3602,60 @@ msgstr "manjka     %s\n"
 msgid "Unknown system error"
 msgstr "Neznan sistem: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, fuzzy, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d napaka(%d)"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, fuzzy, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d napaka(%d)"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, fuzzy, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "zaprto  db okolje %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, fuzzy, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "odstranjeno db okolje %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, fuzzy, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "odpiranje db okolja %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "zaprto  db kazalo       %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "zaprto  db kazalo       %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "odpiranje db kazala       %s/%s %s na�in=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ni mo�no zakleniti z %s datotek %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "izklju�ujo�e"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "skupno"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "zaklenjeno  db kazalo       %s/%s\n"
@@ -3708,76 +3682,76 @@ msgstr ""
 "%s ima preveliko ali premajhno vrednost malega (small) celega\n"
 "�tevila, prezrto\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "manjkajo�i { za %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "manjkajo�i } za %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "oblika zna�ke manjka"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "ime zna�ke manjka"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "neznana zna�ka"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "na koncu polja je pri�akovan ]"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "nepri�akovan ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "nepri�akovan }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "v izrazu je pri�akovan ?"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "v izrazu je za { pri�akovan ?"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "v izrazu je pri�akovan }"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "za podizrazom ? je pri�akovano :"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "v izrazu je za : pri�akovan {"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "na koncu izraza je pri�akovan |"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3800,391 +3774,377 @@ msgstr "ponovno izgradi zbirko iz obstoje�ih glav"
 msgid "verify database files"
 msgstr "poizvedba po datoteki spec"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: neprepoznano ime zna�ke: \"%s\" prezrto\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ni mo�no odpreti kazala %s z uporabo db%d - %s (%d)"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "ni mo�no odpreti kazala %s:"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ni mo�no prebrati glave pri 0x%x"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstranjevanje %d vnosov iz kazala %s\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodajanje \"%s\" v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodajanje %d vnosov v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "za�asna podatkovna zbirka %s �e obstaja"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiranje stare podatkovne zbirke\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "zapis �t. %d v zbirki je po�kodovan -- presko�eno."
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "zapisa ni mo�no dodati na %d"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke je bila neuspe�na; stara ostaja na\n"
 "istem mestu\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe�na!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "odstranjevanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe�na odstranitev imenika %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "zaprta datoteka db       %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "odpiranje db kazala       %s/%s %s na�in=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivni %d prazni %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prazni)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prazni)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "Ciljni medpomnilnik je bil prekora�en"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s vsebuje nezaklju�eno telo"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s vsebuje nezaklju�ene izbire"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s vsebuje prazno telo"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s se ne raz�iri"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznana izbira %c v %s(%s)"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Globina rekurzije (%d) ve�ja od maksimalne (%d)"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Nezaklju�eni %c: %s"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, fuzzy, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Oznaki %% sledi neraz�lenljiv makro"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Makro %%%.*s ni najden - presko�eno"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, fuzzy, c-format
-msgid "File %s: %s\n"
-msgstr "Datoteka %s: %s"
-
-#: rpmio/macro.c:1913
-#, fuzzy, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Datoteka %s je kraj�a od %d bajtov"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- ni podprt za nize"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: pisanje Fwrite je bilo neuspe�no: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "neveljavna �tevilka paketa: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Uspeh"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Nepravilen odziv stre�nika"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 #, fuzzy
 msgid "Server I/O error"
 msgstr "V/I napaka na stre�niku"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "�as odziva stre�nika je potekel"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Naslov stre�nika ni ugotovljiv"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Ime stre�nika ni bilo ugotovljivo"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Neuspe�en poskus priklju�itve na stre�nik"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Neuspe�na vzpostavitev podatkovne povezave s stre�nikom"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "V/I napaka na lokalni datoteki"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Napaka pri nastavitvi oddaljenega stre�nika v pasivni na�in"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Datoteke ni mo�no najti na stre�niku"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Prekinitev v teku"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Neznana ali nepri�akovana napaka"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "branje je bilo neuspe�no: %s (%d)"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 #, fuzzy
 msgid "(no error)"
 msgstr "(napaka 0x%x)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "usodna napaka: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "napaka: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "opozorilo: "
 
@@ -4193,44 +4153,86 @@ msgstr "opozorilo: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "alokacija pomnilnika (%u bajtov) vrnjeno NI�.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "vrata URL morajo biti �tevilka\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspe�no ustvarjanje %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "preveri podpis paketa(-ov)"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "Dol�. podpisa : %d\n"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: odpiranje je bilo neuspe�no: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: branje %s: %s\n"
+
+#, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Ni mo�no zapisati paketa %s: %s"
+
+#, fuzzy
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "napaka pri ustvarjanju za�asne datoteke %s"
+
+#, fuzzy
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr ""
+#~ "ta razli�ica RPM podpira samo pakete z glavnim �tevilom razli�ice <= 3"
+
+#, fuzzy
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "ta razli�ica RPM podpira samo pakete z glavnim �tevilom razli�ice <=4"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Podpis RPM v1.0 ni mo�en\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Sprememba podpisa RPM v2.0 ni mo�na\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
+
+#, fuzzy
+#~ msgid "File %s: %s\n"
+#~ msgstr "Datoteka %s: %s"
+
+#, fuzzy
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Datoteka %s je kraj�a od %d bajtov"
+
 #, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
diff --git a/po/sr.po b/po/sr.po
index 66d9d0ab9..eba917271 100644
--- a/po/sr.po
+++ b/po/sr.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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
@@ -11,52 +11,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "lo�e me�uzavisnosti:\n"
 
-#: build.c:59
+#: build.c:60
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Ne mogu da otvorim %s za �itanje: %s"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build.c:155
+#: build.c:156
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build.c:183
+#: build.c:184
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build.c:229
+#: build.c:230
 #, fuzzy, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build.c:234
+#: build.c:235
 #, fuzzy, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s ne li�i na RPM paket\n"
 
-#: build.c:243
+#: build.c:244
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s ne li�i na RPM paket\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:328
+#: build.c:329
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "gre�ka potrage za paketom %s\n"
@@ -76,181 +76,181 @@ msgstr "gre�ka potrage za paketom %s\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr ""
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Mo�ete slobodno distribuirati dalje pod odredbama GNU GPL"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni re�im mo�e biti naveden"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo jedan tip upita/provere mo�e biti ura�en odjednom"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neo�ekivan izvor upita"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neo�ekivan izvor upita"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "neo�ekivan izvor upita"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "samo instalacija i a�uriranje mogu biti forsirane"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "datoteke mogu biti preme�tene samo tokom instalacije paketa"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate mo�ete koristiti samo kad instalirate novi paket"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mo�ete koristiti samo kod instalacije novog paketa"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju po�eti znakom /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "samo jedno mo�ete da navedete: --excludedocs ili --includedocs"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mo�ete koristiti samo kod brisanja paketa"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mo�ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb mo�ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb mo�ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -258,14 +258,14 @@ msgid ""
 msgstr ""
 "--nodeps mo�ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test mo�ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -273,108 +273,108 @@ msgstr ""
 "--root (-r) mo�ete navesti samo kod instalacije, uklanjanja, upita ili "
 "rekreiranja baze podataka"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju po�eti znakom /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, fuzzy, c-format
 msgid "pgp not found: "
 msgstr "Datoteka nije prona�ena na serveru"
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign se mo�e koristiti samo kod kreiranja paketa"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, fuzzy, c-format
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Ne mogu da otvorim %s za �itanje: %s"
 
-#: build/build.c:208
+#: build/build.c:206
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Pribavljam %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -435,92 +435,92 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr "o�ekivan znak ? u izrazu"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "nedostaje { posle %"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "nedostaje ':' na %s:%d"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "nedostaje { posle %"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:552
+#: build/files.c:551
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/files.c:562
+#: build/files.c:561
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/files.c:574
+#: build/files.c:573
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
-#: build/files.c:887
+#: build/files.c:886
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:905
+#: build/files.c:904
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "preme�tanja moraju po�eti znakom '/'"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Neuspelo �itanje %s: %s."
@@ -550,7 +550,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -570,7 +570,7 @@ msgstr "preme�tanja moraju po�eti znakom '/'"
 msgid "Glob not permitted: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteka nije prona�ena na serveru"
@@ -580,7 +580,7 @@ msgstr "Datoteka nije prona�ena na serveru"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -590,7 +590,7 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "Bad file: %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
@@ -612,185 +612,175 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "neuspelo �itanje: %s (%d)"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "neuspelo �itanje: %s (%d)"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:291
-#, fuzzy, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "Neuspelo �itanje %s: %s."
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "gre�ka: �ini se da %s nije RPM paket\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "gre�ka kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "Ne mogu da upi�em %s"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "napravi PGP potpis"
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -800,32 +790,32 @@ msgstr "Ne mogu da otvorim datoteku %s: "
 msgid "line %d: second %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr ""
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr ""
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr ""
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr ""
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr ""
@@ -835,17 +825,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "paket %s nije naveden u %s"
@@ -855,210 +845,210 @@ msgstr "paket %s nije naveden u %s"
 msgid "line %d: Second description\n"
 msgstr ""
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, fuzzy, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, fuzzy, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "Pribavljam %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "\"%s\" odre�uje vi�e paketa\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "(nepoznat tip)"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "preme�tanja moraju po�eti znakom '/'"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "preme�tanja moraju po�eti znakom '/'"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "fatalna gre�ka: "
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "      Opcije odrednice paketa:"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "privremena baza podataka %s ve� postoji"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, fuzzy, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, fuzzy, c-format
 msgid "No patch number %d\n"
 msgstr "(nije broj)"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, fuzzy, c-format
 msgid "No source number %d\n"
 msgstr "(nije broj)"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, fuzzy, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, fuzzy, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr ""
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1109,310 +1099,314 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, fuzzy, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr ""
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 #, fuzzy
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "instaliraj paket"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, fuzzy, c-format
 msgid "verify %files section from <specfile>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 #, fuzzy
 msgid "build source and binary packages from <specfile>"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 #, fuzzy
 msgid "build binary package only from <specfile>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 #, fuzzy
 msgid "build source package only from <specfile>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, fuzzy, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr ""
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, fuzzy, c-format
 msgid "verify %files section from <tarball>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 #, fuzzy
 msgid "build source and binary packages from <tarball>"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 #, fuzzy
 msgid "build binary package only from <tarball>"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 #, fuzzy
 msgid "build source package only from <tarball>"
 msgstr "napravi pakete za operativni sistem <os>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 #, fuzzy
 msgid "build binary package from <source package>"
 msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 #, fuzzy
 msgid "<source package>"
 msgstr "upit nad svim paketima"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 #, fuzzy
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr "instaliraj paket"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 #, fuzzy
 msgid "override build root"
 msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "ukloni stablo direktorijuma po zavr�etku"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr ""
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr ""
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 #, fuzzy
 msgid "debug file state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "nemoj izvr�iti nijednu fazu"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 #, fuzzy
 msgid "do not verify build dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "proveri potpis u paketu"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr ""
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 #, fuzzy
 msgid "remove sources when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr�etku"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr�etku"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "idi pravo do odre�ene faze (samo za k,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "napravi PGP potpis"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr ""
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ne mogu da izvr�im PGP"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Ne mogu da pro�itam 'sigtarget'"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "PGP omanuo"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "uklanjanje %s nije uspelo: %s"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit nad %s neuspeo\n"
@@ -1462,79 +1456,79 @@ msgstr ""
 msgid " failed - "
 msgstr "PGP omanuo"
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr ""
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr ""
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(nije broj)"
 
@@ -1547,16 +1541,16 @@ msgstr "(nije broj)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(nije broj)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "presko�i sve PGP potpise"
@@ -1576,7 +1570,7 @@ msgstr "mntctl() nije vratio 'fugger' veli�inu: %s"
 msgid "failed to stat %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -1591,11 +1585,11 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "file %s is on an unknown device\n"
 msgstr ""
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr ""
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -1650,47 +1644,42 @@ msgstr "neuspelo otvaranje %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, fuzzy, c-format
-msgid "error creating temporary file %s\n"
-msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1745,189 +1734,178 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-#, fuzzy
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "samo paketi sa glavnim brojevima <= 3 su podr�ani u ovoj verziji RPM-a"
-
-#: lib/package.c:726
-#, fuzzy
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "samo paketi sa glavnim brojevima <= 3 su podr�ani u ovoj verziji RPM-a"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "gre�ka: %s se ne mo�e instalirati\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "napi�i verziju rpm-a koja se koristi"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "po�alji standardni izlaz u <komandu>"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "koristi <dir> kao direktorijum najvi�eg nivoa"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "napi�i verziju rpm-a koja se koristi"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr ""
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2397,7 +2375,7 @@ msgstr "instaliraj paket"
 msgid "don't verify files in package"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
@@ -2446,100 +2424,100 @@ msgstr "potpi�i paket (ukloni teku�i potpis)"
 msgid "generate signature"
 msgstr "napravi PGP potpis"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "nemoj izvr�iti nijednu fazu"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "gre�ka: preska�em %s - neuspelo preno�enje - %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "neuspelo izvr�avanje skripta"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "neuspelo izvr�avanje skripta"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadr�i deljene datoteke\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Ne mogu da upi�em %s"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "gre�ka u formatu: %s\n"
@@ -2643,201 +2621,177 @@ msgstr "pogre�an broj paketa: %s\n"
 msgid "record %u could not be read\n"
 msgstr "ne mogu da pro�itam slog %d\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
 #, fuzzy
-msgid "makeTempFile failed\n"
+msgid "rpmMkTempFile failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "gre�ka: �ini se da %s nije RPM paket\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Ne mogu da potpi�em v1.0 RPM\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Ne mogu da ponovo potpi�em v2.0 RPM\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJU�I KLJU�EVI)"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "nepoznat tag"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "lo�e me�uzavisnosti:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr ""
@@ -2864,106 +2818,121 @@ msgstr ""
 msgid "Upgrading packages..."
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "gre�ka: preska�em %s - neuspelo preno�enje - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "gre�ka: %s se ne mo�e instalirati\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "upit nad svim paketima"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" odre�uje vi�e paketa\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "gre�ka: �ini se da %s nije RPM paket\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Potpis nije na raspolaganju\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "neuspelo �itanje: %s (%d)"
@@ -3008,603 +2977,607 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr ""
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "ne mogu da dobijem %s zaklju�avanje baze podataka"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "paket %s-%s-%s sadr�i deljene datoteke\n"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "paket %s-%s-%s sadr�i deljene datoteke\n"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s sadr�i deljene datoteke\n"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " je potreban paketu %s-%s-%s\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "nedostaje drugo ':' na %s:%d"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "nedostaje ime arhitekture na %s:%d"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Nepotpuna linija podataka na %s:%d"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Premnogo argumenata u liniji podataka na %s:%d"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Lo� broj arhitekture/oper.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Nepotpuna podrazumevana linija na %s:%d"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Premnogo argumenata u podrazumevanoj liniji na %s:%d"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "nedostaje ':' na %s:%d"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "nedostaje argument za %s na %s:%d"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "lo�a opcija '%s' na %s:%d"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Ne mogu da otvorim %s za �itanje: %s"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "nedostaje { posle %"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "gre�ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ne mogu da izvr�im PGP"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "PGP omanuo"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "PGP nije uspeo da zapi�e potpis"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "ne mogu da pro�itam potpis"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "PGP nije uspeo da zapi�e potpis"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va�oj rpmrc datoteci"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va�oj rpmrc datoteci"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "instaliraj paket"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "paket nema imena"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "upit nad svim paketima"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "upit nad svim paketima"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "gre�ka potrage za paketom %s\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "nedostaje { posle %"
@@ -3614,60 +3587,60 @@ msgstr "nedostaje { posle %"
 msgid "Unknown system error"
 msgstr "Neo�ekivana ili nepoznata FTP gre�ka"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, fuzzy, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ne mogu da dobijem %s zaklju�avanje baze podataka"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "deljeno"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
@@ -3692,78 +3665,78 @@ msgstr ""
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "nedostaje { posle %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "nedostaje } posle %"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "prazan 'tag' format'"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "prazno ime tag-a"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "nepoznat tag"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] o�ekivano na kraju niza"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "neo�ekivano ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "neo�ekivano }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "o�ekivan znak ? u izrazu"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ o�ekivano posle ? u izrazu"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} o�ekivano u izrazu"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "o�ekivano : pra�eno ? podizrazom"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ o�ekivano posle : u izrazu"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| o�ekivano na kraju izraza"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3786,394 +3759,380 @@ msgstr "rekreiraj bazu podataka iz postoje�e baze"
 msgid "verify database files"
 msgstr "upit nad %s neuspeo\n"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr ""
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "gre�ka: ne mogu da otvorim %s\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath nije odre�en"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "gre�ka kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "gre�ka zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "ne mogu da pro�itam zaglavlje na %d za proveru"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "gre�ka kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "gre�ka kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "gre�ka zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "gre�ka kod potrage za paketom %s\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "gre�ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "gre�ka zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "dbpath nije odre�en"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "privremena baza podataka %s ve� postoji"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "slog broj %d u bazi podataka je neispravan -- preska�em ga"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "rekreiraj bazu podataka iz postoje�e baze"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr ""
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "(nepoznat tip)"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "paket %s nije na�en u %s"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, fuzzy, c-format
-msgid "File %s: %s\n"
-msgstr "neuspelo otvaranje %s: %s"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr ""
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 #, fuzzy
 msgid "Bad server response"
 msgstr "Lo� odgovor FTP servera"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 #, fuzzy
 msgid "Server I/O error"
 msgstr "Ulazno/izlazna FTP gre�ka"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 #, fuzzy
 msgid "Server timeout"
 msgstr "Tajm-aut FTP servera"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Ne mogu da odredim host adresu FTP servera"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Ne mogu da odredim ime FTP hosta"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Ne mogu da se pove�em sa FTP serverom"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "Ulazno/izlazna gre�ka kod lokalne datoteke"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Gre�ka kod stavljanja udaljenog servera u pasivni re�im"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Datoteka nije prona�ena na serveru"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neo�ekivana ili nepoznata FTP gre�ka"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "neuspelo �itanje: %s (%d)"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 #, fuzzy
 msgid "(no error)"
 msgstr "gre�ka: "
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "fatalna gre�ka: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "gre�ka: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "upozorenje: "
 
@@ -4182,44 +4141,83 @@ msgstr "upozorenje: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "gre�ka: FTP port mora biti broj\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "proveri potpis u paketu"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
 #, fuzzy
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "Neuspelo �itanje %s: %s."
+
+#, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Ne mogu da upi�em %s"
+
+#, fuzzy
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
+
+#, fuzzy
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr ""
+#~ "samo paketi sa glavnim brojevima <= 3 su podr�ani u ovoj verziji RPM-a"
+
+#, fuzzy
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "samo paketi sa glavnim brojevima <= 3 su podr�ani u ovoj verziji RPM-a"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Ne mogu da potpi�em v1.0 RPM\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Ne mogu da ponovo potpi�em v2.0 RPM\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
+
+#, fuzzy
+#~ msgid "File %s: %s\n"
+#~ msgstr "neuspelo otvaranje %s: %s"
+
+#, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Nezadovoljene me�uzavisnosti za %s-%s-%s: "
diff --git a/po/sv.po b/po/sv.po
index 2051f2c3a..897ae5127 100644
--- a/po/sv.po
+++ b/po/sv.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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+0200\n"
 "PO-Revision-Date: 2005-02-18 22:29+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -10,51 +10,51 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "Ouppfyllda byggberoenden:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan inte �ppna specfilen %s: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "Kunde inte �ppna \"tar\"-r�r: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "Kunde inte l�sa specfil fr�n %s\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "Kunde inte byta namn p� %s till %s: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "kunde inte ta status p� %s: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "Filen %s �r inte en vanlig fil.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "Filen %s tycks inte vara en specfil.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger m�lplattformar: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger f�r m�let %s\n"
@@ -74,164 +74,164 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Fr�geflaggor (med -q eller --query):"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifieringsflaggor (med -V eller --verify):"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr "K�llflaggor (med --query eller --verify):"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr "Flaggor f�r traversering av filtr�d (med --ftswalk):"
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "Signaturflaggor:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Databasflaggor:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Byggflaggor med [ <specfil> | <tar-arkiv> | <k�llpaket> ]:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Installations-/Uppdaterings-/Raderingsflaggor"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "Gemensamma flaggor f�r alla rpm-l�gen och bin�rer:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Detta program kan distribueras fritt enligt villkoren i GNU GPL\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Internt fel i argumenthantering (%d) :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "enbart ett huvudl�ge kan anges"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 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:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "ov�ntade fr�geflaggor"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "ov�ntat fr�geformat"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "ov�ntad fr�gek�lla"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "kan inte anv�nda --prefix med --relocate eller --excludepath"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 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:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast anv�ndas n�r nya paket installeras"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix m�ste b�rja med /"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs kan anv�ndas"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart anv�ndas n�r paket raderas"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -239,7 +239,7 @@ msgstr ""
 "skriptinaktiveringsflaggor kan enbart anv�ndas n�r paket installeras eller "
 "raderas"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -247,7 +247,7 @@ msgstr ""
 "utl�sarinaktiveringsflaggor kan enbart anv�ndas n�r paket installeras eller "
 "raderas"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -255,13 +255,13 @@ msgstr ""
 "--nodeps kan enbart anv�ndas n�r paket byggs, byggs om, kompileras om, "
 "installeras, raderas eller verifieras"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan enbart anv�ndas n�r paket installeras, raderas eller byggs"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -269,105 +269,105 @@ msgstr ""
 "--root (-r) kan enbart anv�ndas n�r paket installeras, raderas, fr�gas eller "
 "databasen byggs om"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) m�ste b�rja med /"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "inga filer att signera\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan inte komma �t filen %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp hittades inte: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Ange l�senfras: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av l�senfrasen misslyckades\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "L�senfrasen �r ok.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Felaktig %%_signature-spec i makrofil.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign kan enbart anv�ndas vid paketbyggnation"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna f�r ombyggnation"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "inga specfiler angivna f�r byggnation"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna f�r byggnation"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "inga paket angivna att radera"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "inga paket angivna f�r installation"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna f�r fr�ga"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna f�r verifiering"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "inga argument angivna"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Kan inte �ppna tempor�r fil.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "K�r(%s): %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "K�rning (exec) av %s misslyckades (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "D�lig slutstatus fr�n %s (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -426,92 +426,92 @@ msgstr "&& och || st�ds inte f�r str�ngar\n"
 msgid "syntax error in expression\n"
 msgstr "syntaxfel i uttryck\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK-fel: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "\"(\" saknas i %s %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "\")\" saknas i %s(%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ogiltigt %s-element: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s saknas i %s %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Annat �n blanktecken f�ljer p� %s(): %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Felaktig syntax: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Felaktig r�ttighetsspecifikation: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Felaktig specifikation av katalogr�ttigheter: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Ovanlig lokall�ngd: \"%.*s\" i %%lang(%s)\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Duplicerad lokal %.*s i %%lang(%s)\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Slog i gr�nsen f�r %%docdir\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Endast ett argument till %%docdir\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Tv� filer p� en rad: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Filnamn m�ste b�rja med \"/\": %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan inte blanda special %%doc med andra former: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Filen uppr�knad tv� g�nger: %s\n"
@@ -541,7 +541,7 @@ msgstr "%s: kan inte l�sa ok�nd tagg (%d).\n"
 msgid "%s: public key read failed.\n"
 msgstr "%s: l�sning av publik nyckel misslyckades.\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: inte en publik nyckel med skal.\n"
@@ -561,7 +561,7 @@ msgstr "Filen beh�ver inledande \"/\": %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "Matchning inte till�tet: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Hittade ingen fil vid matchningen: %s\n"
@@ -571,7 +571,7 @@ msgstr "Hittade ingen fil vid matchningen: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunde inte �ppna %%files-fil %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "rad: %s\n"
@@ -581,7 +581,7 @@ msgstr "rad: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Felaktig fil: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Felaktig �gare/grupp: %s\n"
@@ -605,181 +605,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: f�r m�nga uid\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: f�r m�nga uid\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: f�r m�nga uid\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: f�r m�nga gid\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: f�r m�nga gid\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: f�r m�nga gid\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Kunde inte kanonisera v�rdnamn: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "skapande av arkiv misslyckades vid fil %s: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "skapande av arkiv misslyckades: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy kunde inte skriva: %s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy kunde inte l�sa: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunde inte �ppna PreIn-fil: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunde inte �ppna PreUn-fil: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunde inte �ppna PostIn-fil: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunde inte �ppna PostUn-fil: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunde inte �ppna VerifyScript-fil: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunde inte �ppna Trigger-skriptfil: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: �ppna %s: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: l�s %s: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek misslyckades: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s �r inte ett RPM-paket\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: l�ser huvud fr�n %s\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "Kan inte skapa of�r�nderlig huvudregion.\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "Kan inte skriva tempor�rhuvud\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "Felaktig CSA-data\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "Kan inte skriva slutligt huvud\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererar signatur: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "Kan inte l�sa om signaturhuvud.\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte �ppna %s: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kan inte l�sa signaturen %s: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kan inte l�sa huvud fr�n %s: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kan inte skriva huvud till %s: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kan inte l�sa last fr�n %s: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunde inte generera utfilnamn f�r paketet %s: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -789,32 +780,32 @@ msgstr "kan inte skapa %s: %s\n"
 msgid "line %d: second %s\n"
 msgstr "rad %d: andra %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "%%changelog-poster m�ste starta med *\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "ofullst�ndig %%changelog-post\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "felaktigt datum i %%changelog: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog �r inte i fallande kronologisk ordning\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "saknat namn i %%changelog\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "ingen beskrivning i %%changelog\n"
@@ -824,17 +815,17 @@ msgstr "ingen beskrivning i %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "rad %d: Fel i tolkning av %%description: %s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "rad %d: otill�ten flagga %s: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "rad %d: F�r m�nga namn: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "rad %d: Paketet existerar inte: %s\n"
@@ -844,210 +835,210 @@ msgstr "rad %d: Paketet existerar inte: %s\n"
 msgid "line %d: Second description\n"
 msgstr "rad %d: En andra beskrivning\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "rad %d: Fel i tolkning av %%files: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "rad %d: En andra %%files-lista\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arkitekturen �r utesluten: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arkitekturen �r inte medtagen: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS �r uteslutet: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS �r inte medtaget: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "%s-f�lt m�ste finnas med i paketet: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Dubbla %s-poster i paketet: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Kan inte �ppna ikon %s: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Kan inte l�sa ikon %s: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Ok�nd ikontyp: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "rad %d: Felaktig tagg: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "rad %d: Tom tagg: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "rad %d: Otill�tet tecken \"-\" i %s: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot kan inte vara \"/\": %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, 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:563
+#: build/parsePreamble.c:561
 #, 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:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "rad %d: Epoch/Serial-f�lt m�ste vara numeriskt: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "rad %d: Felaktigt %s: best�mningar: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "rad %d: Felaktigt BuildArchitecture-format: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Internt fel: felaktig tagg %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr "F�r�ldrad syntax st�ds inte: %s\n"
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Felaktig paketangivelse %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paketet existerar redan: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "rad %d: Ok�nd tagg: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Specfil kan inte anv�nda BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "D�lig k�lla: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "Inget patch-nummer %d\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "Inget k�llkodsnummer %d\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Kunde inte h�mta nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Fel i tolkning av %%setup: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "rad %d: Felaktigt argument till %%setup: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "rad %d: Felaktig %%setup-flagga %s: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "rad %d: Beh�ver argument till %%patch -b: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "rad %d: Beh�ver argument till %%patch -z: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "rad %d: Felaktigt argument till %%patch -p: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "rad %d: Beh�ver argument till %%patch -p: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "rad %d: Felaktigt argument till %%patch -p: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "F�r m�nga patchar!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "rad %d: Felaktigt argument till %%patch: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "rad %d: andra %%prep\n"
@@ -1099,295 +1090,299 @@ msgstr "rad %d: En andra %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "rad %d: ej st�tt internt skript: %s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "rad %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan inte �ppna %s: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Oavslutat %%if\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerar %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "felformaterad %%include-sats\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Hittade inga kompatibla arkitekturer att bygga\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketet har ingen %%description: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot redan angivet, ignorerar %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "bygg till %prep (packa upp k�llkod samt applicera patchar) fr�n <specfil>"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<specfil>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "bygg till och med %build (%prep, kompilera sedan) fr�n <specfil>"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "bygg till och med %install (%prep, %build, installera sedan) fr�n <specfil>"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "verifiera %files-sektionen i <specfil>"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "bygg k�ll- och bin�rpaket fr�n <specfil>"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "bygg endast bin�rpaket fr�n <specfil>"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "bygg endast k�llpaket fr�n <specfil>"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "bygg till och med %prep (packa upp k�llkod samt applicera patchar) fr�n <tar-"
 "arkiv>"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tar-arkiv>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "bygg till och med %build (%prep, kompilera sedan) fr�n <tar-arkiv>"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "bygg till och med %install (%prep, %build, installera sedan) fr�n <tar-arkiv>"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "verifiera %files-sektionen fr�n <tar-arkiv>"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "bygg k�ll- och bin�rpaket fr�n <tar-arkiv>"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "bygg endast bin�rpaket fr�n <tar-arkiv>"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "bygg endast k�llpaket fr�n <tar-arkiv>"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "bygg bin�rpaket fr�n <k�llpaket>"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<k�llpaket>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "bygg till och med %install (%prep, %build, installera sedan) fr�n <k�llpaket>"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "�sidos�tt byggrot"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "ta bort byggtr�d efter�t"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "generera huvuden kompatibla med rpm4-paketering"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "ignorera ExcludeArch:-direktiv fr�n specfil"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "fels�k filtillst�ndsmaskin"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "utf�r inga steg i byggnationen"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "verifiera inte byggberoenden"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "generera pakethuvuden kompatibla med (�ldre) rpm[23]-paketering"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "verifiera inte paketkontrollsummor"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "verifiera inte databashuvuden n�r de h�mtas"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "verifiera inte paketsignatur(er)"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "acceptera inte �versatta \"msgstr\" fr�n specfilen"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "ta bort k�llkod efter�t"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "ta bort specfil efter�t"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "g� direkt till angivet steg (endast f�r c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "generera en PGP/GPG-signatur"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "�sidos�tt m�lplattform"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "sl� upp �versatta str�ngar i specfilkatalog"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "generera huvuden kompatibla med (�ldre) rpm[23]-paketering"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunde inte k�ra %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunde inte �ppna %s: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, fuzzy, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr "%s: waitpid(%d) rk %d status %x s %u.%03u\n"
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s misslyckades: %s\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "misslyckades med att �ppna %s: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s rmdir av %s misslyckades: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "Misslyckades med att l�sa %s: %s.\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "rad %d: Felaktigt tal: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "rad %d: Felaktigt no%s-tal: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "rad %d: Felaktigt %s-tal: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kan inte fr�ga %s: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "fr�ga av specfil %s misslyckades, kan inte tolka\n"
@@ -1433,52 +1428,52 @@ msgstr "Ingen arkivfilen i huvud"
 msgid " failed - "
 msgstr " misslyckades - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "paket %s var redan tillagt, hoppar �ver %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s �r redan tillagt, ers�tter med %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr "  G�r f�r�ldrat: %s\t\traderar %s\n"
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(cachad)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib tillhandah�ller)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(db-filer)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(db tillhandah�ller)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignorera paketnamnsrelation(er) [%d]\t%s -> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s \"%s\" fr�n tsort-relationer.\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
@@ -1486,26 +1481,26 @@ msgstr ""
 "========== tsort:erar paket (ordning, #f�reg�ngare, #efterf�ljare, tr�d, "
 "djup, bredd)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== endast efterf�ljare (%d byte)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== forts�tter med tsort ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder misslyckades, %d element �terst�r\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(inte ett tal)"
 
@@ -1517,15 +1512,15 @@ msgstr "(inte base64)"
 msgid "(invalid type)"
 msgstr "(felaktig typ)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(inte en klick)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(felaktig xml-typ)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(inte en OpenPGP-signatur)"
 
@@ -1544,7 +1539,7 @@ msgstr "mntctl() kunde inte returnera monteringspunkter: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "kunde inte ta status p� %s: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunde inte �ppna %s: %s\n"
@@ -1559,11 +1554,11 @@ msgstr "%5d 0x%04x %s %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "filen %s �r p� en ok�nd enhet\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== Kataloger ej uttryckligen inkluderade i paketet:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1618,47 +1613,42 @@ msgstr "%s unlink av %s misslyckades: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s skapades som %s\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "l�gger till %d poster fr�n f�rteckning.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan inte skapa %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "fel n�r t�mpor�rfil %s skapades\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "klickstorlek(%d): FEL, 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "tagg[%d]: FEL, tagg %d typ %d position %d antal %d\n"
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr "regionposition: FEL, tagg %d typ %d position %d antal %d\n"
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr "regionavslutning: FEL, tagg %d typ %d position %d antal %d\n"
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "regionstorlek: FEL, ril(%d) > il(%d)\n"
@@ -1713,179 +1703,178 @@ msgstr "hvdklick(%d): FEL, l�sning returnerade %d\n"
 msgid "hdr load: BAD\n"
 msgstr "hvdlast: FEL\n"
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "paket med versionsnummer 1 st�ds inte av denna version av RPM\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "endast paket med huvudnummer <= 4 st�ds av denna version av RPM\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature misslyckades: %s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillg�nglig\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead misslyckades: %s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+#, fuzzy
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "FTS_COMFOLLOW: f�lj kommandoradssyml�nkar"
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+#, fuzzy
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "FTS_LOGICAL: genoml�p logiskt"
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+#, fuzzy
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "FTS_NOCHDIR: byt inte katalog"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+#, fuzzy
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "FTS_NOSTAT: h�mta inte statusinfo"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+#, fuzzy
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "FTS_PHYSICAL: genoml�p fysiskt"
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+#, fuzzy
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "FTS_SEEDOT: returnera punkt och punkt-punkt"
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+#, fuzzy
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "FTS_XDEV: g� inte mellan enheter"
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+#, fuzzy
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "FTS_WHITEOUT: returnera uttsuddningsinformation"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "f�rdefiniera MAKRO till v�rdet UTTR"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "'MAKRO UTTR'"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "definiera MAKRO till v�rdet UTTR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "skriv ut makroexpansion av UTTR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "'UTTR'"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "l�s <FIL:...> ist�llet f�r standardfil(er)"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<FIL:...>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "inaktivera anv�ndningen av libio(3)-API:et"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "skicka standard ut till KMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "KMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "anv�nd ROT som toppniv�katalog"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "visa k�nda fr�getaggar"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "visa slutliga rpmrc- och makrokonfigurationer"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "visa mindre detaljerad utdata"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "visa mer detaljerad utdata"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "visa vilken version av rpm som anv�nds"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "fels�k lastfilstillst�ndsmaskin"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr "anv�nd tr�dar f�r filstillst�ndsmaskin"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "fels�k flagg-/argumenthantering"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "fels�k pakettillst�ndsmaskin"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr "anv�nd tr�dar f�r pakettillst�ndsmaskin"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "fels�k rpmio I/O"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "fels�k cache-hanteringen av URL:ar"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: flaggtabell felkonfigurerad (%d)\n"
@@ -2307,7 +2296,7 @@ msgstr "verifiera inte fils�kerhetskontexter"
 msgid "don't verify files in package"
 msgstr "verifiera inte filerna i paketet"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
@@ -2347,101 +2336,101 @@ msgstr "signera paket (detsamma som --addsign)"
 msgid "generate signature"
 msgstr "generera signatur"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "k�llpaket f�rv�ntades, fann bin�rpaket\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "k�llpaket inneh�ller ingen .spec-fil\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rk %d status %x s %u.%03u\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s.%s) k�r <lua>-skript.\n"
 
 # Avslutande %s blir s�kv�gen till ldconfig.  Det �r en k�rning av
 # programmet man hoppar �ver.  Allts�: �verfl�dig k�rning.
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s.%s) hoppar �ver �verfl�dig \"%s\".\n"
 
 # Jag har felrapporterat den fula anv�ndningen av %ssynchronous
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s.%s) start %ssynkront skript\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s.%s) skript misslyckades, waitpid(%d) rk %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s.%s) skript misslyckades, slutstatus %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s.%s) skript misslyckades, slutstatus %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s har %d filer, test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar �ver %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "Kan inte l�sa om signaturhuvud\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades p� fil %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, fuzzy, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr "F�rs�ker markera %s som installerad p� resultattavla(%p).\n"
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, fuzzy, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr "F�rs�ker markera %s som raderat p� resultattavla(%p).\n"
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "fel format: %s\n"
@@ -2542,126 +2531,107 @@ msgstr "paketpost nummer: %u\n"
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte l�sas\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s �r inte installerat\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(lade till filer)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(lade till tillhandah�llande)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: open misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile misslyckades\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s: inte ett rpm-paket\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: Kan inte signera v1-paketering\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: Kan inte signera om v2-paketering\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: var redan signerad av nyckel-ID %s, hoppar �ver\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: importl�sning misslyckades.\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: import misslyckades.\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead misslyckades\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry misslyckades\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ingen signatur tillg�nglig (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "JA"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2670,71 +2640,67 @@ msgstr ""
 "\"B\"-beroendet beh�ver en epok (antar samma epok som \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s har ouppfyllda %s: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s �verhoppad p� grund av missingok-flagga\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== omflyttningar\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d utesluter  %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d flyttar om %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "hoppar �ver %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att �ppna %s: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "ok�nd tagg: \"%s\"\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "Ouppfyllda beroenden:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    F�reslagna l�sningar:\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "F�rbereder..."
@@ -2759,105 +2725,120 @@ msgstr "Uppgraderar..."
 msgid "Upgrading packages..."
 msgstr "Uppgraderar paket..."
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "L�gger till m�l: %s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "H�mtar %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hoppar �ver %s - �verf�ring misslyckades - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "\tlade till k�llpaket [%d]\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr "paket %s �r inte relokerbart\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "\tlade till bin�rpaket [%d]\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fel vid l�sning fr�n fil %s\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "filen %s beh�ver en nyare version av RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d k�ll- och %d bin�rpaket\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "installerar bin�rpaket\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan inte �ppna filen %s: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" anger flera paket\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "�terst�ller paket (+%d/-%d) till %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "Rensar upp ompaketerade paket:\n"
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\tTar bort %s:\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s: inte ett rpm-paket\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: Ingen signatur tillg�nglig\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "l�sning misslyckades: %s (%d)\n"
@@ -2902,602 +2883,606 @@ msgstr "paketskript kan komma �t rpm-databasen under installation."
 msgid "internal support for lua scripts."
 msgstr "internt st�d f�r lua-skript."
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "skapa transaktionsm�ngd"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "Skapar resultattavla f�r transaktion(%p, %p)\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "annan"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "paket %s �r avsett f�r en %s-arkitektur"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "paket %s �r avsett f�r ett %s-operativsystem"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "paket %s �r redan installerat"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "s�kv�g %s i paket %s �r inte relokerbar"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "fil %s �r en konflikt mellan installationsf�rs�k av %s och %s"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "fil %s fr�n installation av %s st�r i konflikt med filen fr�n paket %s"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s (som �r nyare �n %s) �r redan installerat"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "installation av paket %s kr�ver %ld %cB p� filsystemet %s"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "installation av paket %s kr�ver %ld inoder p� filsystem %s"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s beh�vs av %s%s"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(installerat) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s st�r i konflikt med %s%s"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ok�nt fel %d upptr�dde under behandling av paket %s"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "andra \":\" saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "arkitekturnamn saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ofullst�ndig datarad vid %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "F�r m�nga argument i datarad vid %s:%d\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Felaktigt arkitektur-/os-nummer: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ofullst�ndig standardv�rdesrad vid %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "F�r m�nga argument i standardv�rdesrad vid %s:%d\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Misslyckades med att l�sa %s: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "\":\" saknas (hittade 0x%02x) vid %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "argument till %s saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s expansion misslyckades vid %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan inte �ppna %s vid %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "arkitektur saknas f�r %s vid %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ok�nd flagga \"%s\" vid %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Ok�nt system: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan inte expandera %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Kan inte l�sa %s, HOME �r f�r stor.\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kan inte �ppna %s f�r l�sning: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte �ppna paketdatabas i %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "�verfl�digt \"(\" i paketetikett: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "\"(\" saknas i etikett: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "\")\" saknas i paketetikett: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "kan inte �ppna Solve-databas i %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "L�gger till: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "F�resl�r %s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    F�reslagna l�sningar:\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "monterade filsystem:\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 #, fuzzy
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr "    i  enhet bstrl       btillg       itillg monteringspunkt\n"
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%04x %5u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr "Skapar resultattavla f�r transaktion(%p, %p)\n"
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr "\tResultattavleadress:  %p\n"
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\tAllokerar utrymme f�r %d poster\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr "\tL�gger till post f�r %s till resultattavla.\n"
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr "\t\tStartadress:  %p\n"
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr "\tUppdaterar post f�r %s i resultattavla.\n"
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr "Kan frig�ra resultattavla(%p)\n"
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr "\tReferensr�knare �r noll...frig�r\n"
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr "Letar i resultattavla(%p) efter %s\n"
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr "\tHittade post vid adress:  %p\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 "F�rv�ntad storlek: %12d = inledning(%d)+signaturer(%d)+utfyllnad(%d)+data(%"
 "d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk storlek: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "sighstorlek(%d): FEL, l�sning returnerade %d\n"
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr "sighmagi: FEL\n"
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr "sightaggar: FEL, antal taggar(%d) utanf�r intervall\n"
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr "sighdata: FEL, antal byte(%d) itanf�r intevall\n"
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr "sighklick(%d): FEL, l�sning returnerade %d\n"
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "sightagg[%d]: FEL, tagg %d typ %d position %d antal %d\n"
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr "sighlast: FEL\n"
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr "sighutfyllnad(%d): FEL, l�ste %d byte\n"
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr "sighs sigSize(%d): FEL, fstat(2) misslyckades\n"
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunde inte k�ra %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp misslyckades\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp misslyckades att skriva en signatur\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP signaturstorlek: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "kan inte l�sa signaturen\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fick %d byte PGP-signatur\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "exec misslyckades\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunde inte skriva signatur\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstorlek: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fick %d byte GPG-signatur\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Felaktig %%_signature-spec i makrofil\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, 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"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du m�ste s�tta \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "Huvud+laststorlek: "
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "MD5-summa: "
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "Huvudets SHA1-summa: "
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "Huvud "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "V3 DSA-signatur: "
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "V3 DSA-signatur: "
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Trasig MD5-summa: ST�DS EJ\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: OK�ND (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar �ver katalogen %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr "Transaktion misslyckades...rullar tillbaka\n"
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr "Kunde inte ordna automatiskt �terrullad transaktion!\n"
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr "H�mtar ompaketerade huvuden fr�n transaktionselement\n"
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\tLetar efter %s...\n"
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr "\tTr�ffar hittade.\n"
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr "\tInga tr�ffar hittade.\n"
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr "\tOmpaketerat paket hittades inte!\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr "REMOVETID matchar INSTALLTID.\n"
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\tNamn:  %s.\n"
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\tOmpaketerat paket var %s ...\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 "L�gger till installationselement till automatisk �terrullningstransaktion.\n"
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr "Kunde inte h�mta databasinstans f�r installationselement!\n"
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr "Kunde inte h�mta huvud f�r automatisk �terrullningstransaktion!\n"
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\tLade till ompaketerat pakethuvud: %s.\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr "\tLade till fr�n installationselement %s.\n"
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr "\tLade till raderingselement.\n"
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 "Kunde inte h�mta ompaketerat huvud f�r automatisk �terrullningstransaktion!\n"
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr "L�gg till raderingselement till automatisk �terrullningstransaktion.\n"
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr "\tHittade ett existerande uppdateringselement.\n"
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr "\tL�gger inte till raderingselemtn f�r %s.\n"
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\tLade till ompaketerat paket %s.\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\tLade till fr�n raderingselement %s.\n"
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 "Kunde inte l�gga till raderingselement till automatiskt �terrullad "
 "transaktion.\n"
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr "\tInget ompaketerat paket ... inget att g�ra.\n"
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr "Misslyckades l�sa ompaketerat paket!\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "rimlighetskontrollerar %d element\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr "k�r skript f�re transaktion\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "ber�knar %d filfingeravtryck\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "ber�knar fil�tg�rder\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr "Skapar automatiskt �terrullad transaktion\n"
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr "Till�ggande misslyckades.  Kunde inte l�sa pakethuvud.\n"
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "Till�ggande misslyckades i rpmpsmStage().\n"
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr "Till�ggande misslyckades.  Kunde inte h�mta fillista.\n"
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "Radering misslyckades i rpmpsmStage().\n"
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr "k�r skript efter transaktion\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr "saknas    %c %s"
@@ -3507,60 +3492,60 @@ msgstr "saknas    %c %s"
 msgid "Unknown system error"
 msgstr "Ok�nt system: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d-fel(%d) fr�n %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d-fel(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "st�ngde     db-milj� %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "tog bort    db-milj� %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "�ppnar      db-milj� %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "st�ngde     db-index %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "verifierade db-index %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "�ppnar      db-index %s/%s %s r�ttighet=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan inte f� %s l�s p� %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "delat"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "l�ste       db-index %s/%s\n"
@@ -3585,78 +3570,78 @@ msgstr "%s har f�r stort eller f�r litet \"long\"-v�rde, hoppar �ver\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s har f�r stort eller f�r litet heltalsv�rde, hoppar �ver\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "{ saknas efter %"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "} saknas efter %{"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "tomt taggformat"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "tomt taggnamn"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "ok�nd tagg"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] f�rv�ntades vid slutet p� vektor"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "ov�ntad ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "ov�ntad }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? f�rv�ntades i uttryck"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ f�rv�ntades efter ? i uttryck"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} f�rv�ntades i uttryck"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr ": f�rv�ntades efter ? i deluttryck"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ f�rv�ntades efter : i uttryck"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| f�rv�ntades vid slutet p� uttryck"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(index utanf�r intervall)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "vektoriterator anv�nd med vektor av annan storlek"
 
 # Detta �r ett direktiv till strftime().  Och %c skall vara anpassat
 # till lokalen.
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
@@ -3677,383 +3662,369 @@ msgstr "bygg om databasens inverterade listor fr�n installerade pakets huvuden"
 msgid "verify database files"
 msgstr "verifiera databasfiler"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "generera huvuden kompatibla med (�ldre) rpm[23]-paketering"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: ok�nt taggnamn: \"%s\" ignorerat\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan inte �ppna %s-indexet med db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan inte �ppna %s-indexet\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "ingen dbpath har satts\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fel(%d) n�r \"%s\"-poster h�mtades fr�n %s-indexet\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: hoppar �ver"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "fel(%d) n�r post nr. %d sparades i %s\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: hoppar �ver"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: skadat huvud nr. %u h�mtat -- hoppar �ver.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan inte l�sa huvud vid 0x%x\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "fel(%d) n�r huvudpost nr. %d  f�r %s skulle tas bort\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" fr�n %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "tar bort %d poster fr�n %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "fel(%d) n�r \"%s\"-poster fr�n %s-indexet sattes\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fel(%d) n�r post \"%s\" sparades i %s\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fel(%d) n�r post \"%s\" togs bort fr�n %s\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fel(%d) vid allokering av ny paketinstans\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: hoppar �ver"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "l�gger till \"%s\" till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "l�gger till %d poster till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fel(%d) n�r post %s sparades i %s\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tillf�llig databas %s existerar redan\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "skapar katalog %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "�ppnar gammal databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "�ppnar ny databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "huvud nr. %u i databasen �r felaktigt -- hoppar �ver.\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kan inte l�gga till post ursprungligen vid %u\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ers�tta gammal databas med ny databas!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer fr�n %s f�r att �terst�lla"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "st�ngde     db-index %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "�ppnar      db-index %s/%s %s r�ttighet=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiva %d tomma %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "M�lbuffert �versv�mmad\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s har oavslutad kropp\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s har otill�tet namn (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s har oavslutade flaggor\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "makro %%%s har tom kropp\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s misslyckades att expandera\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s har otill�tet namn (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) anv�ndes inte under niv� %d\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Ok�nd flagga %c i %s(%s)\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Rekursionsdjup(%d) st�rre �n max(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Oavslutad %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Ett %% f�ljs av ett makro som inte kan tolkas\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Inget makro %%%.*s hittat, hoppar �ver\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "Fil %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "Filen %s �r mindre �n %u byte\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "F�r�ldrad syntax st�ds inte: %s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "F�r�ldrad syntax st�ds inte: %s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite misslyckades: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek misslyckades: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Lyckades"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Konstigt svar fr�n server"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "IO-fel mot server"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "F�rbindelsen med servern dog ut (timeout)"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Kunde inte sl� upp serverns adress"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Kunde inte sl� upp serverns namn"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Misslyckades med att kontakta servern"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Misslyckades med att etablera en dataf�rbindelse till servern"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "I/O-fel mot lokal fil"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Fel n�r fj�rrservern sattes i passivt l�ge"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Filen fanns inte p� servern"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Avbruten under g�ng"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Ok�nt eller ov�ntat fel"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "l�sning misslyckades: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(inget fel)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "�desdigert fel: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "fel: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "varning: "
 
@@ -4062,41 +4033,73 @@ msgstr "varning: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "minnesallokering (%u byte) returnerade NULL.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url-port m�ste vara ett tal\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "verifiera inte huvud+lastsignatur"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr "uppdatera inte cachedatabasen, skriv bara ut pakets�kv�gar"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr "Filtraverseringsflaggor:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: %%{_cache_dbpath}-makro �r felkonfigurerat.\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: cacheoperation misslyckades: ec %d.\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: l�sning av paketlista misslyckades: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: l�s %s: %s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "Kan inte skriva slutligt huvud\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "fel n�r t�mpor�rfil %s skapades\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "paket med versionsnummer 1 st�ds inte av denna version av RPM\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr "endast paket med huvudnummer <= 4 st�ds av denna version av RPM\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: Kan inte signera v1-paketering\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: Kan inte signera om v2-paketering\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: Ingen signatur tillg�nglig (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "Fil %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "Filen %s �r mindre �n %u byte\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "Ouppfyllda beroenden f�r %s: "
diff --git a/po/tr.po b/po/tr.po
index 74c2d6a30..3bd83a5b3 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -11,52 +11,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.2alpha\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "Failed build dependencies:\n"
 msgstr "i�lem durdu, �nce ba��ml� paketler kurulmal�:\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "%s spec dosyas� a��lamad�: %s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "tar veriyolu a��lamad�: %m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "%s paketinden spec dosyas� okunamad�\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "%s %s olarak de�i�tirilemedi: %m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "%s durum bilgileri al�namad�: %m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s bir normal bir dosya de�il.\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s bir spec dosyas� gibi g�r�nm�yor.\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Hedef platformlar derleniyor: %s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "%s i�in derleniyor\n"
@@ -76,170 +76,170 @@ 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:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "Sorgulama se�enekleri (-q ya da --query ile)"
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "Denetleme se�enekleri (-V ya da --verify ile)"
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 #, fuzzy
 msgid "Source options (with --query or --verify):"
 msgstr "Denetleme se�enekleri (-V ya da --verify ile)"
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr ""
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "�mza se�enekleri:"
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "Veritaban� se�enekleri:"
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "[ <specDosyas�> | <tarPaketi> | <kaynakPaketi> ] ile paketleme se�enekleri:"
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "Kurma/G�ncelleme/Kald�rma se�enekleri:"
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "T�m rpm kipleri i�in ortak se�enekler:"
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM S�r�m %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Bu program GNU GPL ko�ullar�na uygun olarak serbest�e da��t�labilir."
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "(%d) arg�man� i�lenirken i� hata olu�tu :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip belirtilebilir"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama/denetleme yap�labilir"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama bayraklar�"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama bi�emi"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kayna��"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "sadece  kaynak ve spec silme i�lemleri, kurma, g�ncelleme i�lemleri i�in "
 "zorlanabilir"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr ""
 "dosyalar sadece paket kurulumu s�ras�nda yeni yerlerine yerle�tirilebilir"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate ve --excludepath sadece yeni paket kurulumunda kullan�labilir"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin kurulmas� s�ras�nda kullan�labilir"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ile belirtilenler '/' ile ba�lamal�"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ve --includedocs bir arada kullan�lamaz"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 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:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -247,7 +247,7 @@ msgstr ""
 "betik iptal etme se�enekleri sadece paketin kurulmas� ve silinmesi s�ras�nda "
 "kullan�labilir"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -255,7 +255,7 @@ msgstr ""
 "tetikleme iptal se�enekleri sadece paketin kurulmas� ve silinmesi s�ras�nda "
 "kullan�labilir"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -263,7 +263,7 @@ msgstr ""
 "--nodeps sadece paket olu�turma, yeniden olu�turma, yeniden derleme, "
 "kurulum, kald�rma ve denetleme i�lemlerinde kullan�labilir"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -271,7 +271,7 @@ msgstr ""
 "--test sadece paket kurulumu, kald�r�lmas� ve olu�turulmas� i�lemlerinde "
 "kullan�labilir"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -279,107 +279,107 @@ msgstr ""
 "--root (-r) sadece kurulum, kald�rma, sorgulama ve yeniden veritaban� "
 "olu�turma i�lemlerinde kullan�labilir"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ile verilenler '/' ile ba�lamal�"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "imzalanacak dosya yok\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s dosyas� bulunam�yor\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "pgp bulunamad�: "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "Anahtar parolas�n� girin: "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Anahtar parolas� kontrol� ba�ar�s�z\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Anahtar parolas� do�ru.\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Makro dosyas�ndaki %%_signature spec ge�ersiz.\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign sadece paket olu�turulurken kullan�labilir"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "icra ba�ar�s�z\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "yeniden olu�turmak i�in paket dosyalar� belirtilmemi�"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "olu�turma i�in gerekli spec dosyas� belirtilmemi�"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "olu�turma i�in gereken tar dosyalar� belirtilmemi�"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "y�klenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "y�klenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "denetleme i�in hi� arg�man belirtilmedi"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 #, fuzzy
 msgid "no arguments given"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "Ge�ici dosya a��lamad�.\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "%s icra ediliyor: %s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s 'in icras� ba�ar�s�z (%s): %s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s ��k���nda hata (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -438,92 +438,92 @@ msgstr "&& ve || dizgelerde desteklenmez\n"
 msgid "syntax error in expression\n"
 msgstr "ifadede s�zdizimi hatas�\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK ba�ar�s�z: %s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "%s i�inde '(' yok: %s\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "%s i�inde ')' yok: (%s\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Anda� %s ge�ersiz: %s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s i�inde '(' yok: %s\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() bo�luksuz yaz�lm��: %s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "S�zdizimi hatas�: %s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "mode spec hatal�: %s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "dirmode spec hatal�: %s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "yerel uzunlu�u hatal�: \"%.*s\" (%%lang(%s))\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "%.*s yereli %%lang(%s) i�inde tekrarlanm��\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "%%docdir i�in hit s�n�r�\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "%%docdir i�in sadece tek arg�man\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Bir sat�rda 2 dosya: %s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Dosya \"/\" ile ba�lamal�: %s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "�zel %%doc ile di�er formlar kar��t�r�lamaz: %s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Dosya iki kere g�sterildi: %s\n"
@@ -553,7 +553,7 @@ msgstr ""
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead ba�ar�s�z\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
@@ -573,7 +573,7 @@ msgstr "Dosya \"/\" ile i�ermeli: %s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "sat�r %d: Dosya ad� uygun de�il: %s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Dosya glob taraf�ndan bulunamad�: %s\n"
@@ -583,7 +583,7 @@ msgstr "Dosya glob taraf�ndan bulunamad�: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files dosya %s dosyas�nda a��lamad�: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "sat�r: %s\n"
@@ -593,7 +593,7 @@ msgstr "sat�r: %s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "Dosya hatal�: %s: %s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Kullan�c�/grup hatal�: %s\n"
@@ -615,185 +615,175 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "��lenen dosyalar: %s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname: �ok fazla kullan�c�-kimli�i\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS: �ok fazla kullan�c�-kimli�i\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS: �ok fazla kullan�c�-kimli�i\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname: �ok fazla grup-kimli�i\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS: �ok fazla grup-kimli�i\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS: �ok fazla grup-kimli�i\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "B�yle bir makina yok: %s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "%s dosyas�nda ar�iv olu�turulamad�: %s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "ar�iv olu�turulamad�: %s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy yazma hatas�:%s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy okuma hatas�: %s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Trigger betik dosyas� a��lamad�: %s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s a��l�rken: %s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM: %s okunurken: %s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek ba�ar�s�z: %s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s bir RPM paketi de�il\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ba�l��� okunuyor\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s'den ba�l�k okunamad�: %s\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s'e ba�l�k yaz�lamad�: %s\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "CSA verisi ge�ersiz\n"
 
-#: build/pack.c:524
-#, fuzzy
-msgid "Unable to write final header\n"
-msgstr "%s'e ba�l�k yaz�lamad�: %s\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "�mza �retiliyor: %d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s'den ba�l�k okunamad�: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yaz�lamad�: %s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget %s a��lamad�: %s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s'den ba�l�k okunamad�: %s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s'e ba�l�k yaz�lamad�: %s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s'den payload okunamad�: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yaz�lamad�: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yaz�ld�: %s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s paket dosyas� i�in ��kt� dosya ad� �retilemedi: %s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyas� olu�turulam�yor: %s\n"
@@ -803,32 +793,32 @@ msgstr "%s dosyas� olu�turulam�yor: %s\n"
 msgid "line %d: second %s\n"
 msgstr "%d sat�r: %s saniye\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "%%changelog girdi * ile ba�lamal�\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "%%changelog girdi eksik\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "%%changelog i�inde tarih hatas�: %s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, fuzzy, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog azalan kronolojik s�rada de�il\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "%%changelog i�inde isim yok\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "%%changelog i�inde a��klama yok\n"
@@ -838,17 +828,17 @@ msgstr "%%changelog i�inde a��klama yok\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "sat�r %d: %%description ayr��t�r�l�rken hata: %s�\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "sat�r %d: %s se�ene�i hatal�: %s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "sat�r %d: �sim say�s� fazla: %s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "sat�r %d: Paket yok: %s\n"
@@ -858,210 +848,210 @@ msgstr "sat�r %d: Paket yok: %s\n"
 msgid "line %d: Second description\n"
 msgstr "sat�r %d: �kinci a��klama\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "sat�r %d: %%files ayr��t�r�l�rken hata: %s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "sat�r %d: �kinci %%files listesi\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Mimari d��land�: %s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Mimari i�erilmedi: %s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS d��land�: %s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS i�erilmedi: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "Pakette %s alan mevcut olmal�: %s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Pakette %s girdi tekrarlanm��: %s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "%s k�sayol simgesi a��lamad�: %s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "%s k�sayol simgesi okunamad�: %s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "bilinmeyen k�sayol simgesi t�r�: %s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, 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:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "sat�r %d: Etiket bozuk: %s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "sat�r %d: Etiket bo�: %s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "sat�r %d:  %s i�inde '-' karakteri kurald���: %s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot \"/\" olamaz: %s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "sat�r %d: �nekler \"/\" ile bitemez: %s\n"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "sat�r %d: Docdir '/' ile ba�lamal�: %s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "sat�r %d: Epoch/Serial alan� bir say� olmal�: %s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "sat�r %d: %s hatal�: niteleyiciler: %s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "sat�r %d: BuildArchitecture bi�imi hatal�: %s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "��sel hata: %d etiketi sahte\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Paket �zellikleri hatal�: %s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket zaten var: %s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "sat�r %d: Bilinmeyen etiket: %s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec dosyas� BuildRoot kullanamaz\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "Kaynak hatal�: %s: %s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "%d yama numaras� yok\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "%d kaynak kodu numaras� yok\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "Kaynak kodu olmayan %s sunucudan indirilemedi: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "%%setup ��z�mlenirken hata: %s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "sat�r %d: %%setup arguman� hatal�: %s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "sat�r %d: %%setup se�ene�i %s hatal�: %s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "sat�r %d: %%patch -b'ye arg�man gerekli: %s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "sat�r %d: %%patch -z'ye arg�man gerekli: %s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "sat�r %d: %%patch -p'nin arg�man� hatal�: %s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "sat�r %d: %%patch -p'ye arg�man gerekli: %s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "sat�r %d: %%patch -p'nin arg�man� hatal�: %s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "Yamalar �ok fazla!\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "sat�r %d: %%patch arg�man hatas�: %s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "sat�r %d: %%prep saniye\n"
@@ -1114,306 +1104,310 @@ msgstr "sat�r %d: %s saniye\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "sat�r %d: %%description ayr��t�r�l�rken hata: %s�\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "sat�r %d: %s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if kapanmam��\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean %d ile d�ner\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, 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:336
+#: build/parseSpec.c:327
 #, 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:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include deyimi bozuk\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "Kurgulamak i�in uyumlu mimari yok\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %%description i�ermiyor: %s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot zaten belirtilmi�, %s yoksay�l�yor\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 "<specDosyas�>ndan  %prep ad�m� sayesinde olu�turulur (kaynak paketi a��l�r "
 "ve yamalar uygulan�r)"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<specDosyas�>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 "<specDosyas�>ndan %build ad�m� sayesinde olu�turulur (%prep, sonra da "
 "derlenir)"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 "<specDosyas�>ndan %install ad�m� sayesinde olu�turulur (%prep, %build, sonra "
 "da kurulum)"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "<specDosyas�>ndan %files b�l�m�n� denetler"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "kaynak ve �al��t�r�labilir paketleri <specDosyas�>ndan olu�turur"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "�al��t�r�labilir paketi sadece <specDosyas�>ndan olu�turur"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "kaynak paketi sadece <specDosyas�>ndan olu�turur"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 "<tarpaketi>nden %prep ad�m� sayesinde olu�turulur (kaynak paketi a��l�r ve "
 "yamalar uygulan�r)"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarPaketi>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 "<tarPaketi>nden %build ad�m� sayesinde olu�turulur (%prep, sonra da derleme)"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 "<tarpaketi>nden %install ad�m� sayesinde olu�turulur (%prep, %build, sonra "
 "da kurulur)"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "<tarpaketi>nden %files b�l�m�n� denetler"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "kaynak ve �al��t�r�labilir paketleri <tarpaketi>nden olu�turur"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "�al��t�r�labilir paketi sadece <tarpaketi>nden olu�turur"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "kaynak paketi sadece <tarpaketi>nden olu�turur"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "�al��t�r�labilir paketi <kaynak paketi>nden olu�turur"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<kaynak paketi>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 "<kaynak paketi>nden %install ad�m� sayesinde olu�turulur (%prep, %build, "
 "sonra da kurulur)"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "build root'a zorlar"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "i�lem sonunda paket olu�turma a�ac�n� siler"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "rpm4 paketleme ile uyumlu ba�l�klar� �retir"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "spec dosyas�ndaki ExcludeArch: y�nergeleri yoksay�l�yor"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "hata ay�klama dosyas� durum motoru"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "olu�umun herhangi bir ad�m� icra edilmez"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 #, fuzzy
 msgid "do not verify build dependencies"
 msgstr "paket ba��ml�l�klar�n� denetlemez"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "paket ba�l�klar�n� (eski) rpm[23] paketleme ile uyumlu �retir"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "paket ba��ml�l�klar� do�rulanmaz"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "paket mimarisi denetlenmez"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "paket imzas�n� denetler"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "spec dosyas� i�indeki i18n msgstr'leri kabul edilmez"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "i�lem sonunda kaynaklar� siler"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "i�lem sonunda spec dosyas�n� siler"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "do�rudan belirtilen ad�ma atlar (sadece c ve i i�in)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "PGP/GPG imzas� �retir"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "hedef platforma zorlar"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "spec dosyas�ndaki i18n iletilerine bakar"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "(eski) rpm[23] paketleme ile uyumlu ba�l�klar� �retir"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s ayr�lamad�: %s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr ""
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, c-format
 msgid "%s failed\n"
 msgstr "%s ba�ar�s�z\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr "t�m veri %s i�ine yaz�lamad�\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s / %s dizinin silinmesi ba�ar�s�z: %s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "%s aran�yor: (%s kullanarak)...\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s bulunamad�:\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "sat�r %d: Numara hatal�: %s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "sat�r %d: Hatal� no%s numaras�: %d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "sat�r %d: Hatal� %s numaras�: %s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s sorgulanam�yor: %s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, 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"
@@ -1459,55 +1453,55 @@ msgstr ""
 msgid " failed - "
 msgstr " ba�ar�s�z - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, fuzzy, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr ""
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s EVET (rpmlib sa�lar)\n"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 #, fuzzy
 msgid "(db files)"
 msgstr "db dosyas� %s hatal�\n"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s EVET (db sa�lar)\n"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort ba��nt�lar�ndan %s-%s-%s \"%s\" kald�r�l�yor\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort ba��nt�lar� kaydediliyor\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
@@ -1515,26 +1509,26 @@ msgid ""
 msgstr ""
 "========== paketler tsort'lan�yor (s�ra, #�nc�ller, #ard�llar, derinlik)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== sadece ard�llar (sunum s�ras�)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "�EVR�M:\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort s�r�yor ...\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(bir say� de�il)"
 
@@ -1547,16 +1541,16 @@ msgstr "(bir say� de�il)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(bir say� de�il)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "t�m PGP imzalar�n� atlar"
@@ -1576,7 +1570,7 @@ msgstr "mntctl() sonu�lanan hatal� ba�lant� yerleri nedeniyle ba�ar�s�z: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "stat %s ba�ar�s�z: %s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
@@ -1591,12 +1585,12 @@ msgstr "Dosya %4d: %07o %s.%s\t %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "%s dosyas�n�n bulundu�u ayg�t anla��lamad�\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 #, fuzzy
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========= Pakette bulunmayan dizinler:\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, fuzzy, c-format
 msgid "%10d %s\n"
 msgstr "%9d %s\n"
@@ -1651,47 +1645,42 @@ msgstr "%s / %s ba� kald�r�lamad�: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s %s olarak olu�turuldu\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, fuzzy, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "%d girdi %s indeksine ekleniyor.\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s dosyas� olu�turulam�yor: %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyas�na yaz�lamaz %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "%s ge�ici dosyas� olu�turulurken hata\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
@@ -1746,191 +1735,180 @@ msgstr ""
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "RPM'nin bu s�r�m�nde paket s�r�m� 1 desteklenmiyor\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"RPM'nin bu s�r�m�nde sadece ilk s�r�m rakam� <= 4 olan paketler "
-"destekleniyor\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature ba�ar�s�z\n"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: �mza bulundurmuyor\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead ba�ar�s�z\n"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ba�ar�s�z: %s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s y�klenemedi\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr ""
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr ""
 
-#: lib/poptALL.c:174
+#: lib/poptALL.c:175
 #, fuzzy
-msgid "FTS_NOCHDIR: don't change directories"
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "%s dizini olu�turuluyor\n"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr ""
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr ""
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr ""
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr ""
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "<ifade>+ i�in makro a��l�m�n� g�sterir"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "�ntan�ml� makro dosyas� yerine <dosya:...> okunur"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "libio(3) API kullan�m�n� iptal eder"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "standart ��kt�y� <KOMUT>'a g�nderir"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "�st d�zey dizin olarak <dizin> kullan�l�r"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "tan�mlanm�� sorgulama etiketlerini g�sterir"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "son rpmrc ve makro yap�land�rmas�n� g�sterir"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "daha az ayr�nt�l� ��kt� sa�lar"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "daha ayr�nt�l� ��kt� sa�lar"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "Kullan�lan RPM s�r�m�n� verir"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "hata ay�klama dosyas� durum motoru"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "hata ay�klama dosyas� durum motoru"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "(%d) arg�man� i�lenirken i� hata olu�tu :-(\n"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 #, fuzzy
 msgid "debug package state machine"
 msgstr "hata ay�klama dosyas� durum motoru"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "hata ay�klama dosyas� durum motoru"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "rpmio G/� hata kontrolu"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "URL arabellek kullan�m� hata kontrolu"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -2373,7 +2351,7 @@ msgstr "paketteki dosyalar do�rulanamaz"
 msgid "don't verify files in package"
 msgstr "paketteki dosyalar do�rulanamaz"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "paket ba��ml�l�klar� do�rulanmaz"
 
@@ -2420,99 +2398,99 @@ msgstr "paketi imzalar (mevcut imza kald�r�l�r)"
 msgid "generate signature"
 msgstr "imza �retir"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken �al��t�r�labilir paketi bulundu\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyas� i�ermiyor\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, fuzzy, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s beti�i �al��t�r�l�yor (varsa)\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: %s beti�i ba�ar�s�z (%d), %s-%s-%s atlan�yor\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%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/psm.c:862
+#: lib/psm.c:845
 #, fuzzy, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s beti�inin %s-%s-%s'den icras� ba�ar�s�z, ��k��ta durum %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s %d dosya i�eriyor, test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s beti�i ba�ar�s�z (%d), %s-%s-%s atlan�yor\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "%s'den ba�l�k okunamad�: %s\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ar�iv paketi a��l�rken ba�ar�s�z%s%s: %s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ba�ar�s�z\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr ""
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr ""
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "bi�em yanl��: %s\n"
@@ -2614,128 +2592,109 @@ msgstr "paket kay�t numaras�: %u\n"
 msgid "record %u could not be read\n"
 msgstr "%u. kay�t okunamad�\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu de�il\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 #, fuzzy
 msgid "(added files)"
 msgstr "db dosyas� %s hatal�\n"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (�nlem eklendi)\n"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: a��lamad�: %s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile ba�ar�s�z\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite ba�ar�s�z: %s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s: Fseek ba�ar�s�z: %s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, fuzzy, c-format
-msgid "%s: not an rpm package\n"
-msgstr "arg�man bir RPM paketi de�il\n"
-
-#: lib/rpmchecksig.c:188
-#, fuzzy, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s: v1.0 RPM (eski s�r�m) imzalanamaz\n"
-
-#: lib/rpmchecksig.c:192
-#, fuzzy, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s: v2.0 RPM (eski s�r�m) yeniden imzalanamaz\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead ba�ar�s�z: %s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ba�ar�s�z: %s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, fuzzy, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s: readLead ba�ar�s�z\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, fuzzy, c-format
 msgid "%s: import failed.\n"
 msgstr "%s: readLead ba�ar�s�z\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead ba�ar�s�z\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead ba�ar�s�z\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: �mza bulundurmuyor (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "TAMAM DE��L"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (EKS�K ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (G�VENCES�Z ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "Tamam"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "EVET"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2744,72 +2703,68 @@ msgstr ""
 "\"B\" ba��ml�l��� bir d�nemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici de�il: %s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamas�ndan dolay� %s atland�\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== yeniden konumlama\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d %s'i d��l�yor\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d yeniden konumland�r�l�yor: %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s d��lan�yor\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s %s'e konumlan�yor\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizini %s de yeniden konumlan�yor\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, fuzzy, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "bilinmeyen etiket"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 #, fuzzy
 msgid "Failed dependencies:\n"
 msgstr "ba��ml�l�klarda hata; gerekli paketler:\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "Haz�rlan�yor..."
@@ -2837,105 +2792,120 @@ msgstr "Haz�rlan�yor..."
 msgid "Upgrading packages..."
 msgstr "paket g�nceller"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "%s aran�yor: (%s kullanarak)...\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s al�n�yor\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr "... %s olarak\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s atlan�yor - aktar�m ba�ar�s�z - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s y�klenemedi\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<kaynak paketi>"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "%s paketi yeniden konumland�r�lamaz\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "icra edilebilir paketleri kuruluyor\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s dosyas�ndan okuma hatal�\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s dosyas� RPM'nin daha yeni bir s�r�m�n� gerektiriyor\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "icra edilebilir paketleri kuruluyor\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s dosyas� a��lamad�: %s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" birden fazla paketi tan�ml�yor\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s kuruluyor\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr ""
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, fuzzy, c-format
 msgid "\tRemoving %s:\n"
 msgstr "%s al�n�yor\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, fuzzy, c-format
+msgid "%s: not an rpm package\n"
+msgstr "arg�man bir RPM paketi de�il\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s: �mza bulundurmuyor\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "okuma ba�ar�s�z: %s (%d)\n"
@@ -2981,601 +2951,605 @@ msgstr ""
 msgid "internal support for lua scripts."
 msgstr "- dizgelerde desteklenmez\n"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "%s kilit  %s/%s'den al�namad�\n"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr ""
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr ""
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, fuzzy, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "%s farkl� bir mimari i�in"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, fuzzy, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "%s farkl� bir i�letim sistemi i�in"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "%s zaten kurulu"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "%s dosya yolu %s paketinde yeniden konumland�r�lamaz"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "%s dosyas� kalk���lan %s ve %s kurulumlar� aras�nda �eli�iyor"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "%s dosyas�n�n %s kurulumu %s kurulumundaki dosya ile �eli�iyor"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "%s paketi zaten y�kl� (%s s�r�m�nden daha yeni)"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "%s kurulumu %ld i-d���m gerektiriyor (%s dosya sisteminde)"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, fuzzy, c-format
 msgid "%s is needed by %s%s"
 msgstr " %s-%s-%s i�in gerekli\n"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 #, fuzzy
 msgid "(installed) "
 msgstr "y�klenmedi "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, fuzzy, c-format
 msgid "%s conflicts with %s%s"
 msgstr " %s-%s-%s ile �eli�iyor\n"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "anla��lamayan %d hatas�, %s paketi i�lenirken saptand�"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "%s:%d - ikinci ':' eksik\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s:%d - mimari ismi eksik\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s:%d - veri sat�r� tamamlanmam��\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s:%d - veri sat�r�nda �ok fazla arg�man\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "arch/os numaras� hatal�: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s:%d - �ntan�ml� sat�r tamamlanmam��\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s:%d - �ntan�ml� sat�rda �ok fazla arg�man\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s okunamad�: %s.\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "(0x%02x bulundu) %s:%d de ':' yok\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s i�in %s:%d de arg�man eksik\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s geni�letmesi %s:%d \"%s\" de ba�ar�s�z \n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%s dosyas� a��lam�yor (%s:%d): %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s i�in %s:%d'de eksik mimari\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "se�enek '%s' (%s:%d) de hatal�\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Bilinmeyen sistem: %s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "%s geni�letilemiyor\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "%s okunam�yor, EV �ok b�y�k\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s okuma eri�imi i�in a��lamad�: %s.\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s de Paket veritaban� a��lamad�\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "ge�ersiz paket numaras�: %s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "%s i�inde '(' yok: %s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "ge�ersiz paket numaras�: %s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "%s dizininde rpm veritaban� a��lam�yor\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "sat�r: %s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "%s al�n�yor\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpmts.c:1234
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "ba�l� dosya sistemlerinin listesi al�n�yor\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, fuzzy, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "Dosya %4d: %07o %s.%s\t %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, fuzzy, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "%s %s'e konumlan�yor\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "gereken boyut: %12d = (%d)u�+(%d)imza+(%d)iz+(%d)veri\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Ger�ek boyut: %12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr ""
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "�mza: boyut(%d)+iz(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp hata verdi\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp imzas�n�n yaz�lmas� ba�ar�s�z\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP imza uzunlu�u: %d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "imza okunamad�\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "GPG imzas�n�n %d bayt� al�nd�\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, fuzzy, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "icra ba�ar�s�z\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "imzan�n yaz�lmas� s�ras�nda gpg hata verdi\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG imza uzunlu�u: %d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG imzas�n�n %d bayt� al�nd�\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Makro dosyas�nda %%_signature spec ge�ersiz\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Makro dosyan�zda \"%%_pgp_name\" tan�mlanm�� olmal�\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Makro dosyan�zda \"%%_pgp_name\" belirtmelisiniz\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Ba�l�k �ok uzun"
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "Ba�l�k SHA1 �z�mlemesi do�rulanmaz"
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 #, fuzzy
 msgid " signature: "
 msgstr "�mza yok\n"
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 #, fuzzy
 msgid " DSA signature: "
 msgstr "�mza yok\n"
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "�mza: boyut(%d)+iz(%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini d��lan�yor\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr ""
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr ""
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr ""
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 #, fuzzy
 msgid "\tRepackaged package not found!.\n"
 msgstr "kaynak paketi gerekirken �al��t�r�labilir paketi bulundu\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, fuzzy, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, fuzzy, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "<kaynak paketi>"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, fuzzy, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "<kaynak paketi>"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 #, fuzzy
 msgid "Failure reading repackaged package!\n"
 msgstr "paketten ba�l�k okunmas� s�ras�nda hata olu�tu\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr ""
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr ""
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr ""
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr ""
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, fuzzy, c-format
 msgid "missing   %c %s"
 msgstr "eksik      %s"
@@ -3585,60 +3559,60 @@ msgstr "eksik      %s"
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem: %s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "db%d hata(%d) %s'den: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "db%d hata(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "kapand�      db ortam� %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "silindi       db ortam� %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "a��l�yor      db ortam� %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "kapand�      db endeks %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "do�ruland�    db endeks %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "a��l�yor       db endeks %s/%s %s kip=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%s kilit  %s/%s'den al�namad�\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "ba�da��k"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "payla��ml�"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "kilitli      db endeks %s/%s\n"
@@ -3663,76 +3637,76 @@ msgstr "%s ya �ok b�y�k ya da �ok k���k 'long' de�er i�eriyor, atland�\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s ya �ok b�y�k ya da �ok k���k 'integer' de�er i�eriyor, atland�\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "%% den sonraki { yok"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "%%{ den sonraki } yok"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "etiket bi�emi bo�"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "etiket ismi bo�"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "bilinmeyen etiket"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "dizinin sonunda ] gerekli"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "beklenmeyen ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "beklenmeyen }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "ifade i�erisinde ? gerekli"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "ifade i�erisinde ? dan sonra { gerekli"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "ifade i�inde } gerekli"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "? alt ifadesinden sonra : gerekli"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "ifade i�ersinde : den sonra { gerekli"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "ifadenin sonunda | gerekli"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3753,386 +3727,372 @@ msgstr "kurulu paket ba�l�klar�ndan veritaban� listelerini yeniden olu�turur"
 msgid "verify database files"
 msgstr "veritaban� dosyaral�n� do�rular"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "(eski) rpm[23] paketleme ile uyumlu ba�l�klar� �retir"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: tan�mlanmam�� etiket ad�: \"%s\" yoksay�ld�\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s indeksi db%d - %s (%d) kullanarak a��lamad�\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "%s indeksi a��lamad�\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "belirtilmi� bir dbpath de�eri yok\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kay�t %s indeksinden al�n�yor\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "hata(%d): %s kay�t %s i�ine yaz�l�yor\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: bozuk ba�l�k �rne�i #%u al�nd�, atlan�yor.\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x de ba�l�k okunamad�\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "hata(%d): \"%s\" kay�t %s indeksinden al�n�yor\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "\"%s\" %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%d girdi %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kay�t %s indeksinden al�n�yor\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "hata(%d): %s kay�t %s i�ine yaz�l�yor\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "hata(%d) %s kayd�n %s dosyas�ndan silinmesi\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "yeni paket �rne�ini tutma hatas�(%d)\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: bozuk ba�l�k �rne�i #%u al�nd�, atlan�yor.\n"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "\"%s\" %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%d girdi %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "hata(%d): %s kay�t %s i�ine yaz�l�yor\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "ba�ar�l� db3 yeniden olu�turma ertesinde %s kald�r�l�yor\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "belirtilmi� bir dbpath yok"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%s veritaban� %s i�inde yeniden olu�turuluyor\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "ge�ici veritaban� %s zaten mevcut\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizini olu�turuluyor\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s dizini olu�turuluyor: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "eski veritaban� dbapi %d ile a��l�yor\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "yeni veritaban� dbapi %d ile a��l�yor\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "veritaban�ndaki %u. kay�t hatal� -- atlan�yor\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kay�t �zg�n olarak %u e eklenemedi\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "veritaban� yeniden olu�turulamad�: mevcut veritaban� de�i�meden\n"
 "yerinde b�rak�ld�\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "eski veritaban�n�n yenisiyle de�i�tirilirmesi ba�ar�s�z!\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "kurtarmak i�in %s i�indeki dosyalar %s deki dosyalarla de�i�tiriliyor"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizini siliniyor\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s dizininin silinmesi ba�ar�s�z: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "kapanan db dosyas�     %s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "a��l�yor       db endeks %s/%s %s kip=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d etkin %d bo�\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(bo�)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(bo�)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "Hedef tampon bellek ta�t�\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "%%%s makrosunun g�vdesi sonland�r�lmam��\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "%%%s makrosunun ismi kurald��� (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "%%%s makrosunu se�enekleri sonland�r�lmam��\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "%%%s makrosu bo�\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "%%%s makrosu geni�letmede ba�ar�s�z\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "%%%s makrosunun ismi kurald��� (%%define)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "%%%s (%s) makrosu %d seviyenin alt�nda kullan�lmad�\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%c se�ene�i %s(%s) de anla��lamad�\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Yineleme derinli�i(%d) m�mk�n miktardan(%d) b�y�k\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c sonland�r�lmam��: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Bir ayr��t�r�lamayan makro taraf�ndan bir %% izlendi\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "%%%.*s makrosu bulunamad�, atlan�yor\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "%s dosyas�: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "%s dosyas� %u bayttan k���k\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- dizgelerde desteklenmez\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite ba�ar�s�z: %s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "ge�ersiz paket numaras�: %s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek ba�ar�s�z: %s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "Ba�ar�l�"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "Sunucudan k�t� yan�t"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "Sunucu G/� hatas�"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "Sunucu zaman a��m�"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "Sunucu makina adresi bulunamad�"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "Sunucu makina ismi bulunamad�"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "Sunucuya ba�lan�lamad�"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "Sunucuya veri ba�lant�s� kurulamad�"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "Yerel dosyaya G/� hatas�"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "Kar�� sunucuyu pasif kipe sokma ayarlar�nda hata"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "Dosya sunucuda bulunamad�"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "Kesme i�lemi s�r�yor"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "Bilinmeyen ya da beklenmeyen hata"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "okuma ba�ar�s�z: %s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(hata yok)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "�l�mc�l hata: "
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "hata: "
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "uyar�: "
 
@@ -4141,44 +4101,81 @@ msgstr "uyar�: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "bellek ayr�l�rken (%u bayt) NULL d�nd�.\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "url portu bir say� olmal�\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s olu�turulamad�: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "paket imzas�n� denetler"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 #, fuzzy
 msgid "File tree walk options:"
 msgstr "�mza se�enekleri:"
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: a��lamad�: %s\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma ba�ar�s�z: %s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM: %s okunurken: %s\n"
+
+#, fuzzy
+#~ msgid "Unable to write final header\n"
+#~ msgstr "%s'e ba�l�k yaz�lamad�: %s\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "%s ge�ici dosyas� olu�turulurken hata\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "RPM'nin bu s�r�m�nde paket s�r�m� 1 desteklenmiyor\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "RPM'nin bu s�r�m�nde sadece ilk s�r�m rakam� <= 4 olan paketler "
+#~ "destekleniyor\n"
+
+#, fuzzy
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s: v1.0 RPM (eski s�r�m) imzalanamaz\n"
+
+#, fuzzy
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s: v2.0 RPM (eski s�r�m) yeniden imzalanamaz\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s: �mza bulundurmuyor (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "%s dosyas�: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "%s dosyas� %u bayttan k���k\n"
+
 #, fuzzy
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "%s-%s-%s i�in tatmin edici olmayan ba��ml�l�klar: "
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f9e0e1212..619baeecb 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: 2007-10-24 15:58+0300\n"
+"POT-Creation-Date: 2007-12-05 10:29+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"
@@ -17,51 +17,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: build.c:35
+#: build.c:36
 msgid "Failed build dependencies:\n"
 msgstr "相依性組建失敗：\n"
 
-#: build.c:59
+#: build.c:60
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "無法開啟規格檔案 %s：%s\n"
 
-#: build.c:136 build.c:148
+#: build.c:137 build.c:149
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr "無法開啟打包管道：%m\n"
 
-#: build.c:155
+#: build.c:156
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr "無法從 %s 讀取規格檔案\n"
 
-#: build.c:183
+#: build.c:184
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr "無法將 %s 更名為 %s：%m\n"
 
-#: build.c:229
+#: build.c:230
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr "無法檢視 %s 的狀態：%m\n"
 
-#: build.c:234
+#: build.c:235
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr "%s 不是一個正常的檔案。\n"
 
-#: build.c:243
+#: build.c:244
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s 似乎不是一個規格檔案。\n"
 
-#: build.c:313
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "組建目標平台：%s\n"
 
-#: build.c:328
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr "組建目標 %s\n"
@@ -81,290 +81,290 @@ msgstr "讀取套件的表頭資訊時發生錯誤\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "無法重新開啟酬載：%s\n"
 
-#: rpmqv.c:73
+#: rpmqv.c:76
 msgid "Query options (with -q or --query):"
 msgstr "查詢選項 (使用 -q 或 --query)："
 
-#: rpmqv.c:76
+#: rpmqv.c:79
 msgid "Verify options (with -V or --verify):"
 msgstr "校驗選項 (使用 -V 或 --verify)："
 
-#: rpmqv.c:80
+#: rpmqv.c:83
 msgid "Source options (with --query or --verify):"
 msgstr "原始碼選項 (使用 --query 或 --verify)："
 
-#: rpmqv.c:84
+#: rpmqv.c:87
 msgid "File tree walk options (with --ftswalk):"
 msgstr "檔案樹遍歷選項 (使用 --ftswalk)："
 
-#: rpmqv.c:90
+#: rpmqv.c:93
 msgid "Signature options:"
 msgstr "簽名選項："
 
-#: rpmqv.c:96
+#: rpmqv.c:99
 msgid "Database options:"
 msgstr "資料庫選項："
 
-#: rpmqv.c:102
+#: rpmqv.c:105
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "組建選項中使用 [ <規格檔> | <打包檔> | <原始碼套件> ]："
 
-#: rpmqv.c:108
+#: rpmqv.c:111
 msgid "Install/Upgrade/Erase options:"
 msgstr "安裝/更新/清除選項："
 
-#: rpmqv.c:113 tools/rpmcache.c:524 tools/rpmdeps.c:32 tools/rpmgraph.c:267
+#: rpmqv.c:118 tools/rpmcache.c:526 tools/rpmdeps.c:32 tools/rpmgraph.c:255
 msgid "Common options for all rpm modes and executables:"
 msgstr "用於所有 rpm 模式和可執行檔案的共同選項："
 
-#: rpmqv.c:128 lib/poptI.c:35
+#: rpmqv.c:133 lib/poptI.c:35
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s：%s\n"
 
-#: rpmqv.c:134 lib/poptALL.c:84
+#: rpmqv.c:139 lib/poptALL.c:85
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM 版本 %s\n"
 
-#: rpmqv.c:139
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:140
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "此程式允許在遵守 GNU GPL 協定的前提下自由散布\n"
 
-#: rpmqv.c:285
+#: rpmqv.c:280
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "在處理引數 (%d) 時發生內部錯誤 :-(\n"
 
-#: rpmqv.c:323 rpmqv.c:329 rpmqv.c:335 rpmqv.c:372
+#: rpmqv.c:318 rpmqv.c:324 rpmqv.c:330 rpmqv.c:367
 msgid "only one major mode may be specified"
 msgstr "只能指定一個主要工作模式"
 
-#: rpmqv.c:351
+#: rpmqv.c:346
 msgid "one type of query/verify may be performed at a time"
 msgstr "只有查詢/校驗兩種工作模式能被同時選用"
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "unexpected query flags"
 msgstr "不可預料的查詢旗標"
 
-#: rpmqv.c:358
+#: rpmqv.c:353
 msgid "unexpected query format"
 msgstr "不可預料的查詢格式"
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "unexpected query source"
 msgstr "不可預料的查詢來源"
 
-#: rpmqv.c:404
+#: rpmqv.c:399
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "只有安裝、更新、移除原始碼檔案、移除規格檔案幾種作業可被強制執行"
 
-#: rpmqv.c:406
+#: rpmqv.c:401
 msgid "files may only be relocated during package installation"
 msgstr "在套件安裝時檔案可以被重新部署"
 
-#: rpmqv.c:409
+#: rpmqv.c:404
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "--prefix 不能和 --relocate 或 --excludepath 同時使用"
 
-#: rpmqv.c:412
+#: rpmqv.c:407
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate 和 --excludepath 只能在安裝新軟體時使用"
 
-#: rpmqv.c:415
+#: rpmqv.c:410
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix 只能在安裝新軟體時使用"
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix 的引數必須以「/」開頭"
 
-#: rpmqv.c:421
+#: rpmqv.c:416
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) 選項只能在套件安裝時指定"
 
-#: rpmqv.c:425
+#: rpmqv.c:420
 msgid "--percent may only be specified during package installation"
 msgstr "--percent 選項只能在套件安裝時指定"
 
-#: rpmqv.c:429
+#: rpmqv.c:424
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs 選項只能在套件安裝時指定"
 
-#: rpmqv.c:433
+#: rpmqv.c:428
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs 選項只能在套件安裝時指定"
 
-#: rpmqv.c:437
+#: rpmqv.c:432
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs 選項只能在套件安裝時指定"
 
-#: rpmqv.c:441
+#: rpmqv.c:436
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs 和 --includedocs 兩個選項中只能指定一個"
 
-#: rpmqv.c:445
+#: rpmqv.c:440
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch 選項只能在套件安裝時指定"
 
-#: rpmqv.c:449
+#: rpmqv.c:444
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos 選項只能在套件安裝時指定"
 
-#: rpmqv.c:454
+#: rpmqv.c:449
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize 選項只能在套件安裝時指定"
 
-#: rpmqv.c:458
+#: rpmqv.c:453
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches 選項只能在套件清除時指定"
 
-#: rpmqv.c:462
+#: rpmqv.c:457
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles 選項只能在套件安裝時指定"
 
-#: rpmqv.c:467
+#: rpmqv.c:462
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb 選項只能在套件安裝和清除時指定"
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "與命令稿停用有關的選項只能在套件安裝和清除時指定"
 
-#: rpmqv.c:477
+#: rpmqv.c:472
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "與觸發停用有關的選項只能在套件安裝和清除時指定"
 
-#: rpmqv.c:481
+#: rpmqv.c:476
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr "--nodeps 選項只能在套件的組建、重建、重編譯、安裝、清除和校驗時指定"
 
-#: rpmqv.c:486
+#: rpmqv.c:481
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test 選項只能在套件的安裝、清除和組建時指定"
 
-#: rpmqv.c:491
+#: rpmqv.c:486
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr "--root(-r) 選項只能在套件的安裝、清除、查詢和資料庫重建時指定"
 
-#: rpmqv.c:502
+#: rpmqv.c:497
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) 的引數必須以「/」開頭"
 
-#: rpmqv.c:525
+#: rpmqv.c:523
 #, c-format
 msgid "no files to sign\n"
 msgstr "沒有要簽名的檔案\n"
 
-#: rpmqv.c:530
+#: rpmqv.c:528
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "無法存取檔案 %s\n"
 
-#: rpmqv.c:550
+#: rpmqv.c:548
 #, c-format
 msgid "pgp not found: "
 msgstr "找不到 pgp： "
 
-#: rpmqv.c:558
+#: rpmqv.c:556
 msgid "Enter pass phrase: "
 msgstr "輸入密文： "
 
-#: rpmqv.c:560
+#: rpmqv.c:558
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "密文偵測失敗\n"
 
-#: rpmqv.c:564
+#: rpmqv.c:562
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "密文很好。\n"
 
-#: rpmqv.c:569
+#: rpmqv.c:567
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "在巨集定義檔案中有不正確的 %%_signature 規格。\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:574
 msgid "--sign may only be used during package building"
 msgstr "--sign 選項只能在套件組建時指定"
 
-#: rpmqv.c:592
+#: rpmqv.c:590
 #, c-format
 msgid "exec failed\n"
 msgstr "執行失敗\n"
 
-#: rpmqv.c:628
+#: rpmqv.c:626
 msgid "no packages files given for rebuild"
 msgstr "沒有指定要重建的套件名稱"
 
-#: rpmqv.c:694
+#: rpmqv.c:692
 msgid "no spec files given for build"
 msgstr "沒有指定用於組建的規格檔案名稱"
 
-#: rpmqv.c:696
+#: rpmqv.c:694
 msgid "no tar files given for build"
 msgstr "沒有指定用於組建的打包檔案名稱"
 
-#: rpmqv.c:718
+#: rpmqv.c:716
 msgid "no packages given for erase"
 msgstr "沒有指定要清除的套件名稱"
 
-#: rpmqv.c:756
+#: rpmqv.c:754
 msgid "no packages given for install"
 msgstr "沒有指定要安裝的套件名稱"
 
-#: rpmqv.c:772
+#: rpmqv.c:770
 msgid "no arguments given for query"
 msgstr "沒有指定查詢引數"
 
-#: rpmqv.c:787
+#: rpmqv.c:785
 msgid "no arguments given for verify"
 msgstr "沒有指定校驗引數"
 
-#: rpmqv.c:802
+#: rpmqv.c:800
 msgid "no arguments given"
 msgstr "沒有指定引數"
 
-#: build/build.c:133 build/pack.c:471
+#: build/build.c:132 build/pack.c:418
 msgid "Unable to open temp file.\n"
 msgstr "無法開啟暫時檔案。\n"
 
-#: build/build.c:208
+#: build/build.c:206
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "正在執行 (%s)：%s\n"
 
-#: build/build.c:214
+#: build/build.c:212
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "執行 %s 失敗 (%s)：%s\n"
 
-#: build/build.c:223
+#: build/build.c:221
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "來自 (%s) 錯誤的離開狀態 (%s)\n"
 
-#: build/build.c:333
+#: build/build.c:331
 msgid ""
 "\n"
 "\n"
@@ -423,92 +423,92 @@ msgstr "不支援將「&&」和「||」用於字串\n"
 msgid "syntax error in expression\n"
 msgstr "運算式中有語法錯誤\n"
 
-#: build/files.c:252
+#: build/files.c:251
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "時間檢查失敗：%s\n"
 
-#: build/files.c:309 build/files.c:498 build/files.c:684
+#: build/files.c:308 build/files.c:497 build/files.c:683
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "在 %s %s 中有缺失的「(」\n"
 
-#: build/files.c:320 build/files.c:625 build/files.c:695
+#: build/files.c:319 build/files.c:624 build/files.c:694
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "在 %s(%s 中有缺失的「)」\n"
 
-#: build/files.c:358 build/files.c:650
+#: build/files.c:357 build/files.c:649
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "無效的 %s 符記：%s\n"
 
-#: build/files.c:462
+#: build/files.c:461
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "在 %s %s 中有缺失的「%s」\n"
 
-#: build/files.c:514
+#: build/files.c:513
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() 之後有非空白空格：%s\n"
 
-#: build/files.c:552
+#: build/files.c:551
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "不當的語法：%s(%s)\n"
 
-#: build/files.c:562
+#: build/files.c:561
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "不當的模式 spec：%s(%s)\n"
 
-#: build/files.c:574
+#: build/files.c:573
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "不當的 dirmode spec：%s(%s)\n"
 
-#: build/files.c:722
+#: build/files.c:721
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "不尋常的語區長度：\"%.*s\" 於 %%lang(%s) 之中\n"
 
-#: build/files.c:733
+#: build/files.c:732
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "重製語區 %.*s 於 %%lang(%s) 之中\n"
 
-#: build/files.c:848
+#: build/files.c:847
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "%%docdir 的數量上限\n"
 
-#: build/files.c:856
+#: build/files.c:855
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "%%docdir 只能有一個引數\n"
 
-#: build/files.c:887
+#: build/files.c:886
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "兩個檔案在同一列中：%s\n"
 
-#: build/files.c:905
+#: build/files.c:904
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "檔案必須以「/」開頭：%s\n"
 
-#: build/files.c:917
+#: build/files.c:916
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "無法將特殊 %%doc 與其他形式混合：%s\n"
 
-#: build/files.c:935
+#: build/files.c:934
 #, c-format
 msgid "illegal _docdir_fmt: %s\n"
 msgstr ""
 
-#: build/files.c:1075
+#: build/files.c:1074
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "曾列出兩次的檔案：%s\n"
@@ -538,7 +538,7 @@ msgstr "%s：無法呼叫不明的標記 (%d)。\n"
 msgid "%s: public key read failed.\n"
 msgstr "%s：公鑰讀入失敗。\n"
 
-#: build/files.c:1653 lib/rpmchecksig.c:567
+#: build/files.c:1653 lib/rpmchecksig.c:432
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s：不是一個受保護的公鑰。\n"
@@ -558,7 +558,7 @@ msgstr "檔案需要以「/」開頭：%s\n"
 msgid "Glob not permitted: %s\n"
 msgstr "不容許以萬用字元解析：%s\n"
 
-#: build/files.c:1745 lib/rpminstall.c:305
+#: build/files.c:1745 lib/rpminstall.c:304
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "以萬用字元解析找不到檔案：%s\n"
@@ -568,7 +568,7 @@ msgstr "以萬用字元解析找不到檔案：%s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "無法開啟 %%files 的檔案 %s: %s\n"
 
-#: build/files.c:1809 build/pack.c:137
+#: build/files.c:1809 build/pack.c:132
 #, c-format
 msgid "line: %s\n"
 msgstr "列：%s\n"
@@ -578,7 +578,7 @@ msgstr "列：%s\n"
 msgid "Bad file: %s: %s\n"
 msgstr "損壞的檔案：%s：%s\n"
 
-#: build/files.c:2216 build/parsePrep.c:44
+#: build/files.c:2216 build/parsePrep.c:43
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "損壞的所有者/組別：%s\n"
@@ -602,181 +602,172 @@ msgstr ""
 msgid "Processing files: %s-%s-%s\n"
 msgstr "正在處理檔案：%s-%s-%s\n"
 
-#: build/names.c:44
+#: build/names.c:45
 msgid "getUname: too many uid's\n"
 msgstr "getUname：過多的 uid\n"
 
-#: build/names.c:66
+#: build/names.c:67
 msgid "getUnameS: too many uid's\n"
 msgstr "getUnameS：過多的 uid\n"
 
-#: build/names.c:91
+#: build/names.c:92
 msgid "getUidS: too many uid's\n"
 msgstr "getUidS：過多的 uid\n"
 
-#: build/names.c:116
+#: build/names.c:117
 msgid "getGname: too many gid's\n"
 msgstr "getGname：過多的 gid\n"
 
-#: build/names.c:138
+#: build/names.c:139
 msgid "getGnameS: too many gid's\n"
 msgstr "getGnameS：過多的 gid\n"
 
-#: build/names.c:163
+#: build/names.c:164
 msgid "getGidS: too many gid's\n"
 msgstr "getGidS：過多的 gid\n"
 
-#: build/names.c:197
+#: build/names.c:198
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "無法標準化主電腦名稱：%s\n"
 
-#: build/pack.c:77
+#: build/pack.c:73
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "建立檔案 %s 的保存失敗：%s\n"
 
-#: build/pack.c:80
+#: build/pack.c:76
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "建立保存失敗：%s\n"
 
-#: build/pack.c:100
+#: build/pack.c:96
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy 寫作業失敗：%s\n"
 
-#: build/pack.c:107
+#: build/pack.c:103
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy 讀作業失敗：%s\n"
 
-#: build/pack.c:196 build/pack.c:210
+#: build/pack.c:191 build/pack.c:205
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "無法開啟預先安裝命令稿：%s\n"
 
-#: build/pack.c:203
+#: build/pack.c:198
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "無法開啟預先清除命令稿：%s\n"
 
-#: build/pack.c:217
+#: build/pack.c:212
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "無法開啟安裝後命令稿：%s\n"
 
-#: build/pack.c:224 build/pack.c:231
+#: build/pack.c:219 build/pack.c:226
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "無法開啟清除後命令稿：%s\n"
 
-#: build/pack.c:239
+#: build/pack.c:234
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "無法開啟校驗命令稿檔案：%s\n"
 
-#: build/pack.c:254
+#: build/pack.c:249
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "無法開啟觸發執行命令稿檔案：%s\n"
 
-#: build/pack.c:282
+#: build/pack.c:277
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM：開啟 %s：%s\n"
 
-#: build/pack.c:291
-#, c-format
-msgid "readRPM: read %s: %s\n"
-msgstr "readRPM：讀取 %s：%s\n"
-
-#: build/pack.c:299 build/pack.c:517
+#: build/pack.c:286
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s：檢索失敗：%s\n"
 
-#: build/pack.c:330
+#: build/pack.c:317
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM：%s 不是一個 RPM 套件。\n"
 
-#: build/pack.c:335
+#: build/pack.c:322
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM：正在讀取 %s 的檔案表頭\n"
 
-#: build/pack.c:459
+#: build/pack.c:406
 msgid "Unable to create immutable header region.\n"
 msgstr "無法建立不可變的表頭區域。\n"
 
-#: build/pack.c:478
+#: build/pack.c:425
 msgid "Unable to write temp header\n"
 msgstr "無法寫入臨時表頭\n"
 
-#: build/pack.c:488
+#: build/pack.c:435
 msgid "Bad CSA data\n"
 msgstr "損壞的 CSA 資料\n"
 
-#: build/pack.c:524
-msgid "Unable to write final header\n"
-msgstr "無法寫入表頭結尾\n"
-
-#: build/pack.c:544
+#: build/pack.c:457
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "產生簽名：%d\n"
 
-#: build/pack.c:562
+#: build/pack.c:475
 msgid "Unable to reload signature header.\n"
 msgstr "無法重載簽名表頭。\n"
 
-#: build/pack.c:570
+#: build/pack.c:483
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
 
-#: build/pack.c:606 lib/psm.c:1527
+#: build/pack.c:495 lib/psm.c:1491
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "無法寫入套件：%s\n"
 
-#: build/pack.c:621
+#: build/pack.c:510
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "無法開啟簽名目標 %s：%s\n"
 
-#: build/pack.c:632
+#: build/pack.c:521
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "無法讀取 %s 的表頭：%s\n"
 
-#: build/pack.c:646
+#: build/pack.c:535
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "無法寫入 %s 的表頭：%s\n"
 
-#: build/pack.c:656
+#: build/pack.c:545
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "無法從 %s 讀取酬載: %s\n"
 
-#: build/pack.c:662
+#: build/pack.c:551
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "無法寫入酬載到 %s: %s\n"
 
-#: build/pack.c:699 lib/psm.c:1795
+#: build/pack.c:588
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "已寫入：%s\n"
 
-#: build/pack.c:769
+#: build/pack.c:658
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "無法產生套件 %s 的檔案名稱輸出：%s\n"
 
-#: build/pack.c:785
+#: build/pack.c:674
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "無法建立 %s：%s\n"
@@ -786,32 +777,32 @@ msgstr "無法建立 %s：%s\n"
 msgid "line %d: second %s\n"
 msgstr "列 %d：重複的 %s\n"
 
-#: build/parseChangelog.c:124
+#: build/parseChangelog.c:127
 #, c-format
 msgid "%%changelog entries must start with *\n"
 msgstr "%%changelog 條目必須以「*」符號開頭\n"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:135
 #, c-format
 msgid "incomplete %%changelog entry\n"
 msgstr "不完整的 %%changelog 條目\n"
 
-#: build/parseChangelog.c:147
+#: build/parseChangelog.c:150
 #, c-format
 msgid "bad date in %%changelog: %s\n"
 msgstr "%%changelog 中含有不正確的日期描述：%s\n"
 
-#: build/parseChangelog.c:152
+#: build/parseChangelog.c:155
 #, c-format
 msgid "%%changelog not in descending chronological order\n"
 msgstr "%%changelog 無法繼承年代順序的描述。\n"
 
-#: build/parseChangelog.c:160 build/parseChangelog.c:171
+#: build/parseChangelog.c:163 build/parseChangelog.c:174
 #, c-format
 msgid "missing name in %%changelog\n"
 msgstr "%%changelog 中漏失了名稱\n"
 
-#: build/parseChangelog.c:178
+#: build/parseChangelog.c:181
 #, c-format
 msgid "no description in %%changelog\n"
 msgstr "%%changelog 中沒有更新說明\n"
@@ -821,17 +812,17 @@ msgstr "%%changelog 中沒有更新說明\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "列 %d：解析 %%description 時發生錯誤：%s\n"
 
-#: build/parseDescription.c:53 build/parseFiles.c:49 build/parseScript.c:210
+#: build/parseDescription.c:53 build/parseFiles.c:50 build/parseScript.c:210
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "列 %d：損壞的選項 %s：%s\n"
 
-#: build/parseDescription.c:64 build/parseFiles.c:61 build/parseScript.c:222
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parseScript.c:222
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "列 %d: 太多名稱：%s\n"
 
-#: build/parseDescription.c:72 build/parseFiles.c:70 build/parseScript.c:231
+#: build/parseDescription.c:72 build/parseFiles.c:71 build/parseScript.c:231
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "列 %d：套件不存在：%s\n"
@@ -841,210 +832,210 @@ msgstr "列 %d：套件不存在：%s\n"
 msgid "line %d: Second description\n"
 msgstr "列 %d：重複的 description\n"
 
-#: build/parseFiles.c:35
+#: build/parseFiles.c:36
 #, c-format
 msgid "line %d: Error parsing %%files: %s\n"
 msgstr "列 %d：解析 %%files 時發生錯誤：%s\n"
 
-#: build/parseFiles.c:77
+#: build/parseFiles.c:78
 #, c-format
 msgid "line %d: Second %%files list\n"
 msgstr "列 %d：重複的 %%files 清單\n"
 
-#: build/parsePreamble.c:221
+#: build/parsePreamble.c:216
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "已被排除的架構：%s\n"
 
-#: build/parsePreamble.c:226
+#: build/parsePreamble.c:221
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "未被包含的架構：%s\n"
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:226
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "已被排除的作業系統：%s\n"
 
-#: build/parsePreamble.c:236
+#: build/parsePreamble.c:231
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "未被包含的作業系統：%s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:256
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "必須在目前套件中宣告 %s 欄位：%s\n"
 
-#: build/parsePreamble.c:285
+#: build/parsePreamble.c:283
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "套件中有重複的 %s 條目：%s\n"
 
-#: build/parsePreamble.c:339
+#: build/parsePreamble.c:337
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "無法開啟圖示 %s：%s\n"
 
-#: build/parsePreamble.c:357
+#: build/parsePreamble.c:355
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "無法讀取圖示 %s：%s\n"
 
-#: build/parsePreamble.c:370
+#: build/parsePreamble.c:368
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "不明的圖示類型：%s\n"
 
-#: build/parsePreamble.c:412
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "列 %d: 標記只需單一符記：%s\n"
 
-#: build/parsePreamble.c:442
+#: build/parsePreamble.c:440
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "列 %d: 異常的標記：%s\n"
 
-#: build/parsePreamble.c:450
+#: build/parsePreamble.c:448
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "列 %d: 清空標記：%s\n"
 
-#: build/parsePreamble.c:475 build/parsePreamble.c:482
+#: build/parsePreamble.c:473 build/parsePreamble.c:480
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "列 %d：在 %s 中出現違規字元「-」：%s\n"
 
-#: build/parsePreamble.c:538 build/parseSpec.c:432
+#: build/parsePreamble.c:536 build/parseSpec.c:420
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot 不能是「/」：%s\n"
 
-#: build/parsePreamble.c:551
+#: build/parsePreamble.c:549
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "列 %d：Prefixes 不能以「/」結尾：%s\n"
 
-#: build/parsePreamble.c:563
+#: build/parsePreamble.c:561
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "列 %d：Docdir 必須以「/」開頭：%s\n"
 
-#: build/parsePreamble.c:575
+#: build/parsePreamble.c:573
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "列 %d：Epoch/Serial 欄位的內容必須是一個數字：%s\n"
 
-#: build/parsePreamble.c:615 build/parsePreamble.c:626
+#: build/parsePreamble.c:613 build/parsePreamble.c:624
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "列 %d: 不當的 %s: 限定詞：%s\n"
 
-#: build/parsePreamble.c:652
+#: build/parsePreamble.c:650
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "列 %d：損壞的組建架構格式：%s\n"
 
-#: build/parsePreamble.c:661
+#: build/parsePreamble.c:659
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "內部錯誤：假造的標記 %d\n"
 
-#: build/parsePreamble.c:757
+#: build/parsePreamble.c:755
 #, c-format
 msgid "Legacy syntax is unsupported: %s\n"
 msgstr "不支援舊語法：%s\n"
 
-#: build/parsePreamble.c:820
+#: build/parsePreamble.c:818
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "不當的套件規格：%s\n"
 
-#: build/parsePreamble.c:826
+#: build/parsePreamble.c:824
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "套件已存在：%s\n"
 
-#: build/parsePreamble.c:855
+#: build/parsePreamble.c:853
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "列 %d：不明標記：%s\n"
 
-#: build/parsePreamble.c:877
+#: build/parsePreamble.c:875
 msgid "Spec file can't use BuildRoot\n"
 msgstr "規格檔案不能使用 BuildRoot\n"
 
-#: build/parsePrep.c:39
+#: build/parsePrep.c:38
 #, c-format
 msgid "Bad source: %s: %s\n"
 msgstr "損壞的原始碼檔案：%s：%s\n"
 
-#: build/parsePrep.c:79
+#: build/parsePrep.c:78
 #, c-format
 msgid "No patch number %d\n"
 msgstr "編號為 %d 的修補不存在\n"
 
-#: build/parsePrep.c:174
+#: build/parsePrep.c:173
 #, c-format
 msgid "No source number %d\n"
 msgstr "編號為 %d 的原始碼檔案不存在\n"
 
-#: build/parsePrep.c:195
+#: build/parsePrep.c:194
 #, c-format
 msgid "Couldn't download nosource %s: %s\n"
 msgstr "無法下載 nosource %s: %s\n"
 
-#: build/parsePrep.c:299
+#: build/parsePrep.c:298
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "解析 %%setup 時發生錯誤：%s\n"
 
-#: build/parsePrep.c:314
+#: build/parsePrep.c:313
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "列 %d：%%setup 中出現錯誤的引數：%s\n"
 
-#: build/parsePrep.c:332
+#: build/parsePrep.c:331
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "列 %d：%%setup 中出現錯誤的選項 %s：%s\n"
 
-#: build/parsePrep.c:467
+#: build/parsePrep.c:466
 #, c-format
 msgid "line %d: Need arg to %%patch -b: %s\n"
 msgstr "列 %d：%%patch -b 需要引數：%s\n"
 
-#: build/parsePrep.c:476
+#: build/parsePrep.c:475
 #, c-format
 msgid "line %d: Need arg to %%patch -z: %s\n"
 msgstr "列 %d：%%patch -z 需要引數：%s\n"
 
-#: build/parsePrep.c:493
+#: build/parsePrep.c:492
 #, fuzzy, c-format
 msgid "line %d: Bad arg to %%patch -F: %s\n"
 msgstr "列 %d：%%patch -p 的引數錯誤：%s\n"
 
-#: build/parsePrep.c:505
+#: build/parsePrep.c:504
 #, c-format
 msgid "line %d: Need arg to %%patch -p: %s\n"
 msgstr "列 %d：%%patch -p 需要引數：%s\n"
 
-#: build/parsePrep.c:512
+#: build/parsePrep.c:511
 #, c-format
 msgid "line %d: Bad arg to %%patch -p: %s\n"
 msgstr "列 %d：%%patch -p 的引數錯誤：%s\n"
 
-#: build/parsePrep.c:519
+#: build/parsePrep.c:518
 msgid "Too many patches!\n"
 msgstr "修補過多！\n"
 
-#: build/parsePrep.c:523
+#: build/parsePrep.c:522
 #, c-format
 msgid "line %d: Bad arg to %%patch: %s\n"
 msgstr "列 %d：%%patch 的引數錯誤：%s\n"
 
-#: build/parsePrep.c:557
+#: build/parsePrep.c:556
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "列 %d：重複的 %%prep\n"
@@ -1095,289 +1086,293 @@ msgstr "列 %d：重複的 %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "列 %d：不支援的內建命令稿：%s\n"
 
-#: build/parseSpec.c:175
+#: build/parseSpec.c:178
 #, c-format
 msgid "line %d: %s\n"
 msgstr "列 %d：%s\n"
 
-#: build/parseSpec.c:224
+#: build/parseSpec.c:223
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
 
-#: build/parseSpec.c:238
+#: build/parseSpec.c:236
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if 分支未關閉\n"
 
-#: build/parseSpec.c:315
+#: build/parseSpec.c:306
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean 回傳 %d\n"
 
-#: build/parseSpec.c:324
+#: build/parseSpec.c:315
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d：缺少與 %%if 對應的 %%if\n"
 
-#: build/parseSpec.c:336
+#: build/parseSpec.c:327
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d：缺少與 %%endif 對應的 %%if\n"
 
-#: build/parseSpec.c:350 build/parseSpec.c:359
+#: build/parseSpec.c:341 build/parseSpec.c:350
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "異常的 %%include 宣告\n"
 
-#: build/parseSpec.c:551
+#: build/parseSpec.c:528
 msgid "No compatible architectures found for build\n"
 msgstr "沒有可供組建的相容硬體架構\n"
 
-#: build/parseSpec.c:608
+#: build/parseSpec.c:565
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "套件沒有 %%description：%s\n"
 
-#: build/poptBT.c:98
+#: build/poptBT.c:95
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot 已被指定，忽略 %s\n"
 
-#: build/poptBT.c:146
+#: build/poptBT.c:143
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr "從 <規格檔> 透過 %prep (解壓原始碼和套用修補程式) 來組建"
 
-#: build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153 build/poptBT.c:156
-#: build/poptBT.c:159 build/poptBT.c:162 build/poptBT.c:165
+#: build/poptBT.c:144 build/poptBT.c:147 build/poptBT.c:150 build/poptBT.c:153
+#: build/poptBT.c:156 build/poptBT.c:159 build/poptBT.c:162
 msgid "<specfile>"
 msgstr "<規格檔>"
 
-#: build/poptBT.c:149
+#: build/poptBT.c:146
 msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "從 <規格檔> 透過 %build (%prep，然後編譯) 來組建"
 
-#: build/poptBT.c:152
+#: build/poptBT.c:149
 msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "從 <規格檔> 透過 %install (%prep，%build，然後安裝) 來組建"
 
-#: build/poptBT.c:155
+#: build/poptBT.c:152
 #, c-format
 msgid "verify %files section from <specfile>"
 msgstr "從 <規格檔> 驗證 %files 區段"
 
-#: build/poptBT.c:158
+#: build/poptBT.c:155
 msgid "build source and binary packages from <specfile>"
 msgstr "根據 <規格檔案> 組建原始碼套件與二進位套件"
 
-#: build/poptBT.c:161
+#: build/poptBT.c:158
 msgid "build binary package only from <specfile>"
 msgstr "根據 <規格檔案> 只組建二進位套件"
 
-#: build/poptBT.c:164
+#: build/poptBT.c:161
 msgid "build source package only from <specfile>"
 msgstr "根據 <規格檔案> 只組建原始碼套件"
 
-#: build/poptBT.c:168
+#: build/poptBT.c:165
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr "從 <打包檔> 透過 %prep (解壓原始碼和套用修補程式) 來組建"
 
-#: build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175 build/poptBT.c:178
-#: build/poptBT.c:181 build/poptBT.c:184 build/poptBT.c:187
+#: build/poptBT.c:166 build/poptBT.c:169 build/poptBT.c:172 build/poptBT.c:175
+#: build/poptBT.c:178 build/poptBT.c:181 build/poptBT.c:184
 msgid "<tarball>"
 msgstr "<tarball>"
 
-#: build/poptBT.c:171
+#: build/poptBT.c:168
 msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr "從 <打包檔> 透過 %build (%prep，然後編譯) 來組建"
 
-#: build/poptBT.c:174
+#: build/poptBT.c:171
 msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "從 <打包檔> 透過 %install (%prep，%build，然後安裝) 來組建"
 
-#: build/poptBT.c:177
+#: build/poptBT.c:174
 #, c-format
 msgid "verify %files section from <tarball>"
 msgstr "從 <打包檔> 驗證 %files 區段"
 
-#: build/poptBT.c:180
+#: build/poptBT.c:177
 msgid "build source and binary packages from <tarball>"
 msgstr "從 <tarball> 中組建原始碼套件與二進位套件"
 
-#: build/poptBT.c:183
+#: build/poptBT.c:180
 msgid "build binary package only from <tarball>"
 msgstr "從 <tarball> 中只組建二進位套件"
 
-#: build/poptBT.c:186
+#: build/poptBT.c:183
 msgid "build source package only from <tarball>"
 msgstr "從 <tarball> 中只組建原始碼套件"
 
-#: build/poptBT.c:190
+#: build/poptBT.c:187
 msgid "build binary package from <source package>"
 msgstr "從 <原始碼套件> 中組建二進位套件"
 
-#: build/poptBT.c:191 build/poptBT.c:194
+#: build/poptBT.c:188 build/poptBT.c:191
 msgid "<source package>"
 msgstr "<原始碼套件>"
 
-#: build/poptBT.c:193
+#: build/poptBT.c:190
 msgid ""
 "build through %install (%prep, %build, then install) from <source package>"
 msgstr "從 <原始碼套件> 透過 %install (%prep，%build，然後安裝) 來組建"
 
-#: build/poptBT.c:197
+#: build/poptBT.c:194
 msgid "override build root"
 msgstr "強制覆寫組建根目錄"
 
-#: build/poptBT.c:199
+#: build/poptBT.c:196
 msgid "remove build tree when done"
 msgstr "完成後移除組建目錄樹"
 
-#: build/poptBT.c:201 rpmdb/poptDB.c:28
+#: build/poptBT.c:198 build/poptBT.c:236
 msgid "generate headers compatible with rpm4 packaging"
 msgstr "產生相容於 rpm4 打包的表頭"
 
-#: build/poptBT.c:203
+#: build/poptBT.c:200
 msgid "ignore ExcludeArch: directives from spec file"
 msgstr "忽略 ExcludeArch：根據規格檔案的指示"
 
-#: build/poptBT.c:205
+#: build/poptBT.c:202
 msgid "debug file state machine"
 msgstr "除錯檔案狀態機器"
 
-#: build/poptBT.c:207
+#: build/poptBT.c:204
 msgid "do not execute any stages of the build"
 msgstr "不執行組建程序裡的任何步驟"
 
-#: build/poptBT.c:209
+#: build/poptBT.c:206
 msgid "do not verify build dependencies"
 msgstr "不校驗組建相依關係"
 
-#: build/poptBT.c:211
+#: build/poptBT.c:208
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "產生相容於過去的 rpm2/rpm3 打包的表頭"
 
-#: build/poptBT.c:215 lib/poptALL.c:210 lib/poptI.c:253 lib/poptQV.c:345
+#: build/poptBT.c:212 lib/poptALL.c:211 lib/poptI.c:253 lib/poptQV.c:345
 #: lib/poptQV.c:354 lib/poptQV.c:393
 msgid "don't verify package digest(s)"
 msgstr "不校驗套件摘要"
 
-#: build/poptBT.c:217 lib/poptALL.c:212 lib/poptI.c:255 lib/poptQV.c:348
+#: build/poptBT.c:214 lib/poptALL.c:213 lib/poptI.c:255 lib/poptQV.c:348
 #: lib/poptQV.c:356 lib/poptQV.c:396
 msgid "don't verify database header(s) when retrieved"
 msgstr "取回時不驗證資料庫表頭"
 
-#: build/poptBT.c:219 lib/poptALL.c:218 lib/poptI.c:257 lib/poptQV.c:351
+#: build/poptBT.c:216 lib/poptALL.c:219 lib/poptI.c:257 lib/poptQV.c:351
 #: lib/poptQV.c:358 lib/poptQV.c:398
 msgid "don't verify package signature(s)"
 msgstr "不校驗套件簽名"
 
-#: build/poptBT.c:222
+#: build/poptBT.c:219
 msgid "do not accept i18N msgstr's from specfile"
 msgstr "不接受來自規格檔的 i18N msgstr"
 
-#: build/poptBT.c:224
+#: build/poptBT.c:221
 msgid "remove sources when done"
 msgstr "完成後移除原始碼檔案"
 
-#: build/poptBT.c:226
+#: build/poptBT.c:223
 msgid "remove specfile when done"
 msgstr "完成後移除規格檔案"
 
-#: build/poptBT.c:228
+#: build/poptBT.c:225
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "直接跳到指定的階段 (只有用於 c,i)"
 
-#: build/poptBT.c:230
+#: build/poptBT.c:227
 msgid "generate PGP/GPG signature"
 msgstr "產生 PGP/GPG 簽名"
 
-#: build/poptBT.c:232
+#: build/poptBT.c:229
 msgid "override target platform"
 msgstr "無視目標平台"
 
-#: build/poptBT.c:234
+#: build/poptBT.c:231
 msgid "lookup i18N strings in specfile catalog"
 msgstr "在規格檔目錄中查找 i18N 字串"
 
-#: build/rpmfc.c:117
+#: build/poptBT.c:233
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr "產生與(舊的) rpm[23] 包裝相容的表頭"
+
+#: build/rpmfc.c:122
 #, c-format
 msgid "\texecv(%s) pid %d\n"
 msgstr ""
 
-#: build/rpmfc.c:123
+#: build/rpmfc.c:128
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "無法執行 %s: %s\n"
 
-#: build/rpmfc.c:128 lib/psm.c:840
+#: build/rpmfc.c:133 lib/psm.c:823
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
 
-#: build/rpmfc.c:210
+#: build/rpmfc.c:215
 #, fuzzy, c-format
 msgid "\twaitpid(%d) rc %d status %x\n"
 msgstr "%s: waitpid(%d) rc %d 狀況 %x 秒 %u.%03u\n"
 
-#: build/rpmfc.c:214
+#: build/rpmfc.c:219
 #, fuzzy, c-format
 msgid "%s failed\n"
 msgstr "%s 失敗：%s\n"
 
-#: build/rpmfc.c:218
+#: build/rpmfc.c:223
 #, fuzzy, c-format
 msgid "failed to write all data to %s\n"
 msgstr "無法寫入酬載到 %s: %s\n"
 
-#: build/rpmfc.c:1237
+#: build/rpmfc.c:1242
 #, fuzzy, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "開啟 %s 失敗：%s\n"
 
-#: build/rpmfc.c:1245
+#: build/rpmfc.c:1250
 #, fuzzy, c-format
 msgid "magic_load failed: %s\n"
 msgstr "%s 移除目錄 %s 失敗：%s\n"
 
-#: build/rpmfc.c:1289
+#: build/rpmfc.c:1294
 #, c-format
 msgid "magic_file(ms, \"%s\") failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1497
+#: build/rpmfc.c:1493
 #, fuzzy, c-format
 msgid "Finding  %s: %s\n"
 msgstr "檔案 %s: %s\n"
 
-#: build/rpmfc.c:1503 build/rpmfc.c:1512
+#: build/rpmfc.c:1499 build/rpmfc.c:1508
 #, fuzzy, c-format
 msgid "Failed to find %s:\n"
 msgstr "讀取 %s 失敗: %s。\n"
 
-#: build/spec.c:225
+#: build/spec.c:227
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "列 %d：錯誤的編號：%s\n"
 
-#: build/spec.c:231
+#: build/spec.c:233
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "列 %d: 不當的 no%s 數字：%d\n"
 
-#: build/spec.c:290
+#: build/spec.c:292
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "列 %d: 不當的 %s 數字：%s\n"
 
-#: build/spec.c:591
+#: build/spec.c:593
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "無法查詢 %s：%s\n"
 
-#: build/spec.c:657
+#: build/spec.c:659
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "規格檔 %s 的查詢失敗，無法剖析\n"
@@ -1423,77 +1418,77 @@ msgstr "在檔頭中沒有歸檔檔案"
 msgid " failed - "
 msgstr " 失敗 - "
 
-#: lib/depends.c:192
+#: lib/depends.c:190
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "套件 %s 已被加入，忽略 %s\n"
 
-#: lib/depends.c:209
+#: lib/depends.c:207
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "套件 %s 已被加入，替換 %s\n"
 
-#: lib/depends.c:343
+#: lib/depends.c:341
 #, c-format
 msgid "  Obsoletes: %s\t\terases %s\n"
 msgstr "  過時的：%s\t\t清除 %s\n"
 
-#: lib/depends.c:425
+#: lib/depends.c:423
 msgid "(cached)"
 msgstr "(快取)"
 
-#: lib/depends.c:441
+#: lib/depends.c:439
 msgid "(rpmlib provides)"
 msgstr "(rpmlib 提供)"
 
-#: lib/depends.c:469
+#: lib/depends.c:467
 msgid "(db files)"
 msgstr "(資料庫檔案)"
 
-#: lib/depends.c:481
+#: lib/depends.c:479
 msgid "(db provides)"
 msgstr "(資料庫提供)"
 
-#: lib/depends.c:782
+#: lib/depends.c:780
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "忽略套件名稱關聯 [%d]\t %s-> %s\n"
 
-#: lib/depends.c:887
+#: lib/depends.c:885
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "從樹狀排列關係移除 %s\"%s\"。\n"
 
-#: lib/depends.c:1107
+#: lib/depends.c:1105
 msgid "========== recording tsort relations\n"
 msgstr "========== 記錄樹狀排列關係\n"
 
-#: lib/depends.c:1199
+#: lib/depends.c:1197
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, depth, "
 "breadth)\n"
 msgstr "========== 樹狀排列套件 (次序、#前行者、#後繼者、樹、深度、廣度)\n"
 
-#: lib/depends.c:1290
+#: lib/depends.c:1288
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== 只有後繼符號 (%d 位元組)\n"
 
-#: lib/depends.c:1363
+#: lib/depends.c:1361
 msgid "LOOP:\n"
 msgstr "迴圈：\n"
 
-#: lib/depends.c:1398
+#: lib/depends.c:1396
 msgid "========== continuing tsort ...\n"
 msgstr "========== 繼續樹狀排列…\n"
 
-#: lib/depends.c:1403
+#: lib/depends.c:1401
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder 失敗，剩下 %d 個元件\n"
 
-#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:463
-#: rpmdb/header.c:3117 rpmdb/header.c:3142 rpmdb/header.c:3161
+#: lib/formats.c:35 lib/formats.c:65 lib/formats.c:94 lib/formats.c:461
+#: rpmdb/header.c:3118 rpmdb/header.c:3143 rpmdb/header.c:3162
 msgid "(not a number)"
 msgstr "(不是數字)"
 
@@ -1505,15 +1500,15 @@ msgstr "(不是 base64)"
 msgid "(invalid type)"
 msgstr "(無效型態)"
 
-#: lib/formats.c:186 lib/formats.c:355
+#: lib/formats.c:186 lib/formats.c:353
 msgid "(not a blob)"
 msgstr "(不是 blob)"
 
-#: lib/formats.c:299
+#: lib/formats.c:297
 msgid "(invalid xml type)"
 msgstr "(無效 xml 型態)"
 
-#: lib/formats.c:378
+#: lib/formats.c:376
 msgid "(not an OpenPGP signature)"
 msgstr "(不是一個 OpenPGP 簽名)"
 
@@ -1532,7 +1527,7 @@ msgstr "mntctl() 回傳掛載點失敗：%s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "無法檢驗狀態：%s：%s\n"
 
-#: lib/fs.c:148 rpmio/url.c:258
+#: lib/fs.c:148 rpmio/url.c:260
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "開啟 %s 失敗：%s\n"
@@ -1547,11 +1542,11 @@ msgstr "%5d 0x%04x %s %s\n"
 msgid "file %s is on an unknown device\n"
 msgstr "檔案 %s 位於一個不明的裝置上\n"
 
-#: lib/fsm.c:305
+#: lib/fsm.c:304
 msgid "========== Directories not explicitly included in package:\n"
 msgstr "========== 未被明確包含在套件內的目錄：\n"
 
-#: lib/fsm.c:307
+#: lib/fsm.c:306
 #, c-format
 msgid "%10d %s\n"
 msgstr "%10d %s\n"
@@ -1606,47 +1601,42 @@ msgstr "%s 刪除檔案 %s 失敗：%s\n"
 msgid "%s created as %s\n"
 msgstr "%s 如同 %s 而建立\n"
 
-#: lib/manifest.c:122
+#: lib/manifest.c:121
 #, c-format
 msgid "adding %d args from manifest.\n"
 msgstr "從清單中加入 %d 個引數。\n"
 
-#: lib/misc.c:40
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "無法建立 %%%s %s\n"
 
-#: lib/misc.c:45
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "無法寫入 %%%s %s\n"
 
-#: lib/misc.c:181 lib/misc.c:186 lib/misc.c:192
-#, c-format
-msgid "error creating temporary file %s\n"
-msgstr "建立暫時檔案 %s 時發生錯誤\n"
-
 #: lib/package.c:334
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "blob 大小(%d):不當的， 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:199
+#: lib/package.c:343 lib/package.c:399 lib/package.c:466 lib/signature.c:196
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "標記[%d]:不當的，標記 %d 型態 %d 偏移 %d 計數 %d\n"
 
-#: lib/package.c:361 lib/signature.c:213
+#: lib/package.c:361 lib/signature.c:210
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr "區域偏移：不當的，標記 %d 型態 %d 偏移 %d 計數 %d\n"
 
-#: lib/package.c:379 lib/signature.c:237
+#: lib/package.c:379 lib/signature.c:234
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr "區域結尾：不當的，標記 %d 型態 %d 偏移 %d 計數 %d\n"
 
-#: lib/package.c:390 lib/signature.c:248
+#: lib/package.c:390 lib/signature.c:245
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "區域大小：不當的， ril(%d)> il(%d)\n"
@@ -1701,179 +1691,178 @@ msgstr "hdr blob(%d):不當的，讀取回傳 %d\n"
 msgid "hdr load: BAD\n"
 msgstr "hdr 載入：不當的\n"
 
-#: lib/package.c:717
-msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr "此 RPM 版本不支援第 1 版的打包\n"
-
-#: lib/package.c:726
-msgid ""
-"only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr "此 RPM 版本只支援主版本號 <=4 的打包\n"
-
-#: lib/package.c:738 lib/rpmchecksig.c:203 lib/rpmchecksig.c:719
+#: lib/package.c:711 lib/rpmchecksig.c:196 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s：rpmReadSignature 失敗：%s"
 
-#: lib/package.c:745 lib/rpmchecksig.c:210 lib/rpmchecksig.c:727
+#: lib/package.c:718 lib/rpmchecksig.c:203 lib/rpmchecksig.c:561
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s：未發現簽名\n"
 
-#: lib/package.c:810
+#: lib/package.c:783
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s:：headerRead 失敗：%s"
 
-#: lib/package.c:845 lib/package.c:871 lib/package.c:902 lib/rpmchecksig.c:815
+#: lib/package.c:818 lib/package.c:844 lib/package.c:875 lib/rpmchecksig.c:649
 #, c-format
 msgid "skipping package %s with unverifiable V%u signature\n"
 msgstr ""
 
-#: lib/package.c:916 lib/rpmchecksig.c:100 lib/rpmchecksig.c:638
+#: lib/package.c:889 lib/rpmchecksig.c:101 lib/rpmchecksig.c:502
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread 失敗：%s\n"
 
-#: lib/package.c:1012
+#: lib/package.c:969
 #, fuzzy, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s 無法安裝\n"
 
-#: lib/package.c:1016
+#: lib/package.c:973
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:170
-msgid "FTS_COMFOLLOW: follow command line symlinks"
+#: lib/poptALL.c:171
+#, fuzzy
+msgid "RPMGI_COMFOLLOW: follow command line symlinks"
 msgstr "FTS_COMFOLLOW: 跟隨命令列符號連結"
 
-#: lib/poptALL.c:172
-msgid "FTS_LOGICAL: logical walk"
+#: lib/poptALL.c:173
+#, fuzzy
+msgid "RPMGI_LOGICAL: logical walk"
 msgstr "FTS_LOGICAL: 邏輯遍歷"
 
-#: lib/poptALL.c:174
-msgid "FTS_NOCHDIR: don't change directories"
+#: lib/poptALL.c:175
+#, fuzzy
+msgid "RPMGI_NOCHDIR: don't change directories"
 msgstr "FTS_NOCHDIR: 不變更目錄"
 
-#: lib/poptALL.c:176
-msgid "FTS_NOSTAT: don't get stat info"
+#: lib/poptALL.c:177
+#, fuzzy
+msgid "RPMGI_NOSTAT: don't get stat info"
 msgstr "FTS_NOSTAT: 不取得狀態資訊"
 
-#: lib/poptALL.c:178
-msgid "FTS_PHYSICAL: physical walk"
+#: lib/poptALL.c:179
+#, fuzzy
+msgid "RPMGI_PHYSICAL: physical walk"
 msgstr "FTS_PHYSICAL:實體遍歷"
 
-#: lib/poptALL.c:180
-msgid "FTS_SEEDOT: return dot and dot-dot"
+#: lib/poptALL.c:181
+#, fuzzy
+msgid "RPMGI_SEEDOT: return dot and dot-dot"
 msgstr "FTS_SEEDOT: 回傳 . 和 .."
 
-#: lib/poptALL.c:182
-msgid "FTS_XDEV: don't cross devices"
+#: lib/poptALL.c:183
+#, fuzzy
+msgid "RPMGI_XDEV: don't cross devices"
 msgstr "FTS_XDEV: 不交叉裝置"
 
-#: lib/poptALL.c:184
-msgid "FTS_WHITEOUT: return whiteout information"
+#: lib/poptALL.c:185
+#, fuzzy
+msgid "RPMGI_WHITEOUT: return whiteout information"
 msgstr "FTS_WHITEOUT: 回傳空白化資訊"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:198
 msgid "predefine MACRO with value EXPR"
 msgstr "預先以值 EXPR 定義巨集"
 
-#: lib/poptALL.c:198 lib/poptALL.c:201
+#: lib/poptALL.c:199 lib/poptALL.c:202
 msgid "'MACRO EXPR'"
 msgstr "「巨集 EXPR」"
 
-#: lib/poptALL.c:200
+#: lib/poptALL.c:201
 msgid "define MACRO with value EXPR"
 msgstr "定義巨集附有值 EXPR"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:204
 msgid "print macro expansion of EXPR"
 msgstr "印出巨集展開的 EXPR"
 
-#: lib/poptALL.c:204
+#: lib/poptALL.c:205
 msgid "'EXPR'"
 msgstr "「EXPR」"
 
-#: lib/poptALL.c:206 lib/poptALL.c:225 lib/poptALL.c:229
+#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "讀取 <檔案:…> 以代替預設檔案"
 
-#: lib/poptALL.c:207 lib/poptALL.c:226 lib/poptALL.c:230
+#: lib/poptALL.c:208 lib/poptALL.c:227 lib/poptALL.c:231
 msgid "<FILE:...>"
 msgstr "<檔案:…>"
 
-#: lib/poptALL.c:215 lib/poptALL.c:249
+#: lib/poptALL.c:216 lib/poptALL.c:250
 msgid "disable use of libio(3) API"
 msgstr "停止使用 libio(3) API"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:222
 msgid "send stdout to CMD"
 msgstr "發送標準輸出到 CMD"
 
-#: lib/poptALL.c:222
+#: lib/poptALL.c:223
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:234
 msgid "use ROOT as top level directory"
 msgstr "使用 ROOT 做為頂層目錄"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:235
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:237
+#: lib/poptALL.c:238
 msgid "display known query tags"
 msgstr "顯示已知的查詢標記"
 
-#: lib/poptALL.c:239
+#: lib/poptALL.c:240
 msgid "display final rpmrc and macro configuration"
 msgstr "顯示完整的 rpmrc 與巨集定義配置"
 
-#: lib/poptALL.c:241
+#: lib/poptALL.c:242
 msgid "provide less detailed output"
 msgstr "提供較少的細節輸出"
 
-#: lib/poptALL.c:243
+#: lib/poptALL.c:244
 msgid "provide more detailed output"
 msgstr "提供較多的細節輸出"
 
-#: lib/poptALL.c:245
+#: lib/poptALL.c:246
 msgid "print the version of rpm being used"
 msgstr "印出正在使用的 rpm 版本資訊"
 
-#: lib/poptALL.c:258
+#: lib/poptALL.c:259
 msgid "debug payload file state machine"
 msgstr "對酬載檔案狀態機器除錯"
 
-#: lib/poptALL.c:260
+#: lib/poptALL.c:261
 msgid "use threads for file state machine"
 msgstr "使用執行緒做為檔案狀態機器"
 
-#: lib/poptALL.c:265
+#: lib/poptALL.c:266
 msgid "debug option/argument processing"
 msgstr "對選項/引數處理除錯"
 
-#: lib/poptALL.c:270
+#: lib/poptALL.c:271
 msgid "debug package state machine"
 msgstr "對套件狀態機器除錯"
 
-#: lib/poptALL.c:272
+#: lib/poptALL.c:273
 msgid "use threads for package state machine"
 msgstr "使用執行緒用於套件狀態機"
 
-#: lib/poptALL.c:286
+#: lib/poptALL.c:287
 msgid "debug rpmio I/O"
 msgstr "對 rpmio I/O 除錯"
 
-#: lib/poptALL.c:298
+#: lib/poptALL.c:299
 msgid "debug URL cache handling"
 msgstr "對網址快取處理除錯"
 
-#: lib/poptALL.c:360
+#: lib/poptALL.c:361
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: 選項表格 misconfigured(%d)\n"
@@ -2290,7 +2279,7 @@ msgstr "不校驗檔案的安全關聯"
 msgid "don't verify files in package"
 msgstr "不校驗套件內的檔案"
 
-#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:263
+#: lib/poptQV.c:322 lib/poptQV.c:325 tools/rpmgraph.c:251
 msgid "don't verify package dependencies"
 msgstr "不校驗套件的相依關係"
 
@@ -2330,98 +2319,98 @@ msgstr "對套件簽名 (與 --addsign 含義相同)"
 msgid "generate signature"
 msgstr "產生簽名"
 
-#: lib/psm.c:250
+#: lib/psm.c:247
 msgid "source package expected, binary found\n"
 msgstr "需要一個原始碼套件，但這是一個二進位套件\n"
 
-#: lib/psm.c:361
+#: lib/psm.c:358
 msgid "source package contains no .spec file\n"
 msgstr "原始碼套件內沒有 .spec 檔案\n"
 
-#: lib/psm.c:446
+#: lib/psm.c:443
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rc %d 狀況 %x 秒 %u.%03u\n"
 
-#: lib/psm.c:587
+#: lib/psm.c:584
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr "%s: %s(%s-%s-%s.%s) 正在執行 <lua> 短命令稿。\n"
 
-#: lib/psm.c:604
+#: lib/psm.c:601
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s.%s) 正在略過冗餘的「%s」。\n"
 
-#: lib/psm.c:612
+#: lib/psm.c:609
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s.%s) %s同步的短命令稿開始\n"
 
-#: lib/psm.c:811
+#: lib/psm.c:803
 #, c-format
 msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
+#: lib/psm.c:834
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗，waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:858
+#: lib/psm.c:841
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗，離開狀態 %d\n"
 
-#: lib/psm.c:862
+#: lib/psm.c:845
 #, c-format
 msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗，離開狀態 %d\n"
 
-#: lib/psm.c:1257
+#: lib/psm.c:1238
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s ：%s 含有 %d 個檔案，test = %d\n"
 
-#: lib/psm.c:1433
+#: lib/psm.c:1414
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s：%s 短命令稿執行失敗 (%d)，略過 %s\n"
 
-#: lib/psm.c:1539
+#: lib/psm.c:1503
 msgid "Unable to reload signature header\n"
 msgstr "無法重載簽名表頭\n"
 
-#: lib/psm.c:1614
+#: lib/psm.c:1578
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "解壓保存檔案失敗 %s%s：%s\n"
 
-#: lib/psm.c:1615
+#: lib/psm.c:1579
 msgid " on file "
 msgstr "  於檔案 "
 
-#: lib/psm.c:1803
+#: lib/psm.c:1760
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s 失敗的於檔案 %s: %s\n"
 
-#: lib/psm.c:1806
+#: lib/psm.c:1763
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s 失敗：%s\n"
 
-#: lib/psm.c:1983
+#: lib/psm.c:1940
 #, fuzzy, c-format
 msgid "Attempting to mark %s as installed in score board(%p).\n"
 msgstr "試圖在記錄板(%2$u)中標記 %1$s 為已安裝。\n"
 
-#: lib/psm.c:2016
+#: lib/psm.c:1973
 #, fuzzy, c-format
 msgid "Attempting to mark %s as erased in score board(%p).\n"
 msgstr "試圖在記錄板(0x%2$x)中標記 %1$s 為已清除。\n"
 
-#: lib/query.c:115 lib/rpmts.c:604
+#: lib/query.c:115 lib/rpmts.c:674
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "不正確的格式：%s\n"
@@ -2522,126 +2511,107 @@ msgstr "套件記錄：%u\n"
 msgid "record %u could not be read\n"
 msgstr "記錄 %u 無法讀取\n"
 
-#: lib/query.c:672 lib/rpminstall.c:736
+#: lib/query.c:672 lib/rpminstall.c:728
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "套件 %s 尚未安裝\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:660
 msgid "(added files)"
 msgstr "(加入的檔案)"
 
-#: lib/rpmal.c:769
+#: lib/rpmal.c:736
 msgid "(added provide)"
 msgstr "(加入的提供物)"
 
-#: lib/rpmchecksig.c:46 lib/rpmchecksig.c:1041
+#: lib/rpmchecksig.c:47 lib/rpmchecksig.c:875
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s：開啟失敗：%s\n"
 
-#: lib/rpmchecksig.c:58
-msgid "makeTempFile failed\n"
+#: lib/rpmchecksig.c:59
+#, fuzzy
+msgid "rpmMkTempFile failed\n"
 msgstr "makeTempFile 失敗\n"
 
-#: lib/rpmchecksig.c:94
+#: lib/rpmchecksig.c:95
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite 失敗：%s\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:105
 #, fuzzy, c-format
 msgid "%s: Fflush failed: %s\n"
 msgstr "%s：檢索失敗：%s\n"
 
-#: lib/rpmchecksig.c:183 lib/rpmchecksig.c:701
-#, c-format
-msgid "%s: not an rpm package\n"
-msgstr "%s：不是一個 rpm 套件\n"
-
-#: lib/rpmchecksig.c:188
-#, c-format
-msgid "%s: Can't sign v1 packaging\n"
-msgstr "%s：無法對 v1 版打包簽名\n"
-
-#: lib/rpmchecksig.c:192
-#, c-format
-msgid "%s: Can't re-sign v2 packaging\n"
-msgstr "%s：無法對 v2 版打包重新簽名\n"
-
-#: lib/rpmchecksig.c:311
+#: lib/rpmchecksig.c:304
 #, c-format
 msgid "%s: was already signed by key ID %s, skipping\n"
 msgstr "%s: 已經由鍵值識別號 %s 所簽名, 跳過\n"
 
-#: lib/rpmchecksig.c:339
+#: lib/rpmchecksig.c:336
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s：writeLead 失敗：%s\n"
 
-#: lib/rpmchecksig.c:345
+#: lib/rpmchecksig.c:342
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s：rpmWriteSignature 失敗：%s\n"
 
-#: lib/rpmchecksig.c:562
+#: lib/rpmchecksig.c:427
 #, c-format
 msgid "%s: import read failed(%d).\n"
 msgstr "%s：匯入讀取時失敗(%d)。\n"
 
-#: lib/rpmchecksig.c:574
+#: lib/rpmchecksig.c:439
 #, c-format
 msgid "%s: import failed.\n"
 msgstr "%s：匯入失敗。\n"
 
-#: lib/rpmchecksig.c:606
+#: lib/rpmchecksig.c:470
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s：headerRead 失敗\n"
 
-#: lib/rpmchecksig.c:620
+#: lib/rpmchecksig.c:484
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s：headerGetEntry 失敗\n"
 
-#: lib/rpmchecksig.c:707
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s：無可用簽名 (v1.0 RPM)\n"
-
-#: lib/rpmchecksig.c:979
+#: lib/rpmchecksig.c:813
 msgid "NOT OK"
 msgstr "不正確"
 
-#: lib/rpmchecksig.c:980 lib/rpmchecksig.c:994
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (MISSING KEYS:"
 msgstr " (丟失的密鑰："
 
-#: lib/rpmchecksig.c:982 lib/rpmchecksig.c:996
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:983 lib/rpmchecksig.c:997
+#: lib/rpmchecksig.c:817 lib/rpmchecksig.c:831
 msgid " (UNTRUSTED KEYS:"
 msgstr " (不信任的密鑰："
 
-#: lib/rpmchecksig.c:985 lib/rpmchecksig.c:999
+#: lib/rpmchecksig.c:819 lib/rpmchecksig.c:833
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:993
+#: lib/rpmchecksig.c:827
 msgid "OK"
 msgstr "正確"
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "NO "
 msgstr "否 "
 
-#: lib/rpmds.c:509 lib/rpmds.c:835
+#: lib/rpmds.c:532 lib/rpmds.c:858
 msgid "YES"
 msgstr "是"
 
-#: lib/rpmds.c:803
+#: lib/rpmds.c:826
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2650,71 +2620,67 @@ msgstr ""
 "\"B\"相依性需要世代 (假設與 \"A\" 為相同世代)\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:834
+#: lib/rpmds.c:857
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/rpmds.c:856
+#: lib/rpmds.c:879
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "套件 %s 有不滿足的 %s：%s\n"
 
-#: lib/rpmfi.c:490
+#: lib/rpmfi.c:488
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s 由於 missingok 旗標而被略過\n"
 
-#: lib/rpmfi.c:759
+#: lib/rpmfi.c:758
 msgid "========== relocations\n"
 msgstr "========== 重新部署\n"
 
-#: lib/rpmfi.c:763
+#: lib/rpmfi.c:762
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d 排除  %s\n"
 
-#: lib/rpmfi.c:766
+#: lib/rpmfi.c:765
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d 重新部署 %s -> %s\n"
 
-#: lib/rpmfi.c:897
+#: lib/rpmfi.c:896
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "排除 %s %s\n"
 
-#: lib/rpmfi.c:907
+#: lib/rpmfi.c:906
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "重新部署 %s 到 %s\n"
 
-#: lib/rpmfi.c:998
+#: lib/rpmfi.c:997
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "重新部署目錄 %s 到 %s\n"
 
-#: lib/rpmgi.c:66 lib/rpminstall.c:96 lib/rpminstall.c:422
-#: lib/rpminstall.c:554 lib/rpmts.c:615 tools/rpmgraph.c:120
-#: tools/rpmgraph.c:157
+#: lib/rpmgi.c:96 lib/rpminstall.c:96 lib/rpminstall.c:425
+#: lib/rpminstall.c:557 lib/rpmts.c:685 tools/rpmgraph.c:119
+#: tools/rpmgraph.c:156
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "開啟 %s 失敗：%s\n"
 
-#: lib/rpmgi.c:324
+#: lib/rpmgi.c:354
 #, c-format
 msgid "unknown tag: \"%s\"\n"
 msgstr "不明的標記：「%s」\n"
 
-#: lib/rpmgi.c:585 lib/rpminstall.c:597 lib/rpminstall.c:770
-#: lib/rpminstall.c:1016 lib/transaction.c:947 tools/rpmgraph.c:195
+#: lib/rpmgi.c:614 lib/rpminstall.c:600 lib/rpminstall.c:762
+#: lib/rpminstall.c:1008 lib/transaction.c:934 tools/rpmgraph.c:194
 msgid "Failed dependencies:\n"
 msgstr "相依性偵測失敗：\n"
 
-#: lib/rpmgi.c:590 lib/rpminstall.c:603 tools/rpmgraph.c:200
-msgid "    Suggested resolutions:\n"
-msgstr "    推薦解決方案：\n"
-
 #: lib/rpminstall.c:157
 msgid "Preparing..."
 msgstr "正在準備…"
@@ -2739,105 +2705,120 @@ msgstr "更新中…"
 msgid "Upgrading packages..."
 msgstr "正在更新套件…"
 
-#: lib/rpminstall.c:351
+#: lib/rpminstall.c:350
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "加入目的物：%s\n"
 
-#: lib/rpminstall.c:367
+#: lib/rpminstall.c:366
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "取回中 %s\n"
 
-#: lib/rpminstall.c:380
+#: lib/rpminstall.c:383
 #, c-format
 msgid " ... as %s\n"
 msgstr " … 為 %s\n"
 
-#: lib/rpminstall.c:384
+#: lib/rpminstall.c:387
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "略過 %s - 傳輸失敗 - %s\n"
 
-#: lib/rpminstall.c:441 lib/rpminstall.c:831 tools/rpmgraph.c:140
+#: lib/rpminstall.c:444 lib/rpminstall.c:823 tools/rpmgraph.c:139
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s 無法安裝\n"
 
-#: lib/rpminstall.c:458
+#: lib/rpminstall.c:461
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "\t加入原始碼套件 [%d]\n"
 
-#: lib/rpminstall.c:483
+#: lib/rpminstall.c:486
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr "套件 %s 不能重新部署\n"
 
-#: lib/rpminstall.c:525
+#: lib/rpminstall.c:528
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "\t加入二進位套件 [%d]\n"
 
-#: lib/rpminstall.c:530
+#: lib/rpminstall.c:533
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "讀取檔案 %s 時發生錯誤\n"
 
-#: lib/rpminstall.c:536
+#: lib/rpminstall.c:539
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "檔案 %s 需要更新版本的 RPM\n"
 
-#: lib/rpminstall.c:568
+#: lib/rpminstall.c:571
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: 不是 rpm 套件(或套件清單)：%s\n"
 
-#: lib/rpminstall.c:583
+#: lib/rpminstall.c:586
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "找到 %d 個原始碼套件和 %d 個二進位套件\n"
 
-#: lib/rpminstall.c:632
+#: lib/rpminstall.c:623
 msgid "installing binary packages\n"
 msgstr "正在安裝二進位套件\n"
 
-#: lib/rpminstall.c:657
+#: lib/rpminstall.c:648
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "無法開啟檔案 %s：%s\n"
 
-#: lib/rpminstall.c:745
+#: lib/rpminstall.c:737
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "「%s」指定了多個套件\n"
 
-#: lib/rpminstall.c:815
+#: lib/rpminstall.c:807
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "無法開啟檔案 %s：%s\n"
 
-#: lib/rpminstall.c:821
+#: lib/rpminstall.c:813
 #, c-format
 msgid "Installing %s\n"
 msgstr "正在安裝 %s\n"
 
-#: lib/rpminstall.c:1010 lib/transaction.c:940
+#: lib/rpminstall.c:1002 lib/transaction.c:927
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "回溯套件 (+%d/-%d) to %-24.24s (0x%08x)：\n"
 
-#: lib/rpminstall.c:1041 lib/transaction.c:991
+#: lib/rpminstall.c:1033 lib/transaction.c:979
 msgid "Cleaning up repackaged packages:\n"
 msgstr "正在清除重新產生的打包：\n"
 
-#: lib/rpminstall.c:1048 lib/transaction.c:997
+#: lib/rpminstall.c:1040 lib/transaction.c:986
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\t正在移除 %s：\n"
 
-#: lib/rpmlead.c:46
+#: lib/rpmlead.c:99
+#, c-format
+msgid "%s: not an rpm package\n"
+msgstr "%s：不是一個 rpm 套件\n"
+
+#: lib/rpmlead.c:103
+#, fuzzy, c-format
+msgid "%s: illegal signature type\n"
+msgstr "%s：未發現簽名\n"
+
+#: lib/rpmlead.c:107
+#, c-format
+msgid "%s: unsupported RPM package (version %d)\n"
+msgstr ""
+
+#: lib/rpmlead.c:120
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "讀取失敗：%s (%d)\n"
@@ -2882,593 +2863,597 @@ msgstr "套件內建短命令稿在安裝程序中可以存取 rpm 資料庫。"
 msgid "internal support for lua scripts."
 msgstr "內部支援 lua 命令稿。"
 
-#: lib/rpmlock.c:118 lib/rpmlock.c:125
+#: lib/rpmlock.c:120 lib/rpmlock.c:127
 #, fuzzy, c-format
 msgid "can't create transaction lock on %s\n"
 msgstr "建立異動作業集"
 
-#: lib/rpmlock.c:122
+#: lib/rpmlock.c:124
 #, fuzzy, c-format
 msgid "waiting for transaction lock on %s\n"
 msgstr "產生異動作業記錄板(%p, %p)\n"
 
-#: lib/rpmps.c:306
+#: lib/rpmps.c:303
 msgid "different"
 msgstr "不同的"
 
-#: lib/rpmps.c:314
+#: lib/rpmps.c:311
 #, c-format
 msgid "package %s is intended for a %s architecture"
 msgstr "套件 %s 是適用於 %s 架構的"
 
-#: lib/rpmps.c:319
+#: lib/rpmps.c:316
 #, c-format
 msgid "package %s is intended for a %s operating system"
 msgstr "套件 %s 是適用於 %s 作業系統的"
 
-#: lib/rpmps.c:324
+#: lib/rpmps.c:321
 #, c-format
 msgid "package %s is already installed"
 msgstr "套件 %s 已經安裝了"
 
-#: lib/rpmps.c:329
+#: lib/rpmps.c:326
 #, c-format
 msgid "path %s in package %s is not relocatable"
 msgstr "在套件 %2$s 中的路徑 %1$s 無法重新部署"
 
-#: lib/rpmps.c:334
+#: lib/rpmps.c:331
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "在試圖安裝的 %s 和 %s 之間產生檔案 %s 的衝突"
 
-#: lib/rpmps.c:339
+#: lib/rpmps.c:336
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "從 %s 安裝的檔案 %s 與來自套件 %s 的檔案產生衝突"
 
-#: lib/rpmps.c:344
+#: lib/rpmps.c:341
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "套件 %s (較 %s 版本還新) 已經安裝了"
 
-#: lib/rpmps.c:349
+#: lib/rpmps.c:346
 #, c-format
 msgid "installing package %s needs %ld%cB on the %s filesystem"
 msgstr "安裝套件 %s 時需要 %ld%cB 空間於檔案系統 %s 上"
 
-#: lib/rpmps.c:359
+#: lib/rpmps.c:356
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "安裝套件 %s 時需要 %ld 個節點於檔案系統 %s 上"
 
-#: lib/rpmps.c:363
+#: lib/rpmps.c:360
 #, c-format
 msgid "%s is needed by %s%s"
 msgstr "%s 被 %s%s 所需要"
 
-#: lib/rpmps.c:365 lib/rpmps.c:370
+#: lib/rpmps.c:362 lib/rpmps.c:367
 msgid "(installed) "
 msgstr "(已安裝) "
 
-#: lib/rpmps.c:368
+#: lib/rpmps.c:365
 #, c-format
 msgid "%s conflicts with %s%s"
 msgstr "%s 與 %s%s 衝突"
 
-#: lib/rpmps.c:374
+#: lib/rpmps.c:371
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "不明錯誤 %d 發生在處理套件 %s 的程序中"
 
-#: lib/rpmrc.c:185
+#: lib/rpmrc.c:194
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "在 %s:%d 處漏失了第二個「:」\n"
 
-#: lib/rpmrc.c:188
+#: lib/rpmrc.c:197
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "在 %s:%d 處漏失了架構名稱\n"
 
-#: lib/rpmrc.c:333
+#: lib/rpmrc.c:342
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "不完整資料列位於 %s:%d\n"
 
-#: lib/rpmrc.c:338
+#: lib/rpmrc.c:347
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "在資料列的 %s:%d 中有太多引數\n"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "損壞的架構/作業系統序號：%s (%s:%d)\n"
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:386
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "不完整預設列位於 %s:%d\n"
 
-#: lib/rpmrc.c:382
+#: lib/rpmrc.c:391
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "在預設列的 %s:%d 中有太多引數\n"
 
-#: lib/rpmrc.c:514
+#: lib/rpmrc.c:521
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "讀取 %s 失敗: %s。\n"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:558
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "缺少 ':' (找到 0x%02x) 於 %s:%d\n"
 
-#: lib/rpmrc.c:568 lib/rpmrc.c:620
+#: lib/rpmrc.c:575 lib/rpmrc.c:627
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s 缺少引數於 %s:%d\n"
 
-#: lib/rpmrc.c:585
+#: lib/rpmrc.c:592
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s 擴充失敗於 %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:593
+#: lib/rpmrc.c:600
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "無法開啟 %s 於 %s:%d: %s\n"
 
-#: lib/rpmrc.c:612
+#: lib/rpmrc.c:619
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "缺少 %s 架構於 %s:%d\n"
 
-#: lib/rpmrc.c:679
+#: lib/rpmrc.c:686
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "不當的選項 '%s' 於 %s:%d\n"
 
-#: lib/rpmrc.c:1426
+#: lib/rpmrc.c:1414
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "不明的系統：%s\n"
 
-#: lib/rpmrc.c:1427
+#: lib/rpmrc.c:1415
 #, c-format
 msgid "Please contact %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1647
+#: lib/rpmrc.c:1635
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "無法展開 %s\n"
 
-#: lib/rpmrc.c:1652
+#: lib/rpmrc.c:1640
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "無法讀取 %s，HOME 過大。\n"
 
-#: lib/rpmrc.c:1669
+#: lib/rpmrc.c:1657
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "無法開啟 %s 以讀取：%s\n"
 
-#: lib/rpmts.c:159
+#: lib/rpmts.c:101
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "無法開啟套件資料庫 %s\n"
 
-#: lib/rpmts.c:268
+#: lib/rpmts.c:210
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "額外的「(」存在於套件標籤中：%s\n"
 
-#: lib/rpmts.c:286
+#: lib/rpmts.c:228
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "丟失的「(」存在於套件標籤中：%s\n"
 
-#: lib/rpmts.c:294
+#: lib/rpmts.c:236
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "丟失的「)」存在於套件標籤中：%s\n"
 
-#: lib/rpmts.c:498
+#: lib/rpmts.c:572
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "無法開啟解析資料庫於 %s\n"
 
-#: lib/rpmts.c:636
+#: lib/rpmts.c:706
 #, c-format
 msgid "Adding: %s\n"
 msgstr "正在加入：%s\n"
 
-#: lib/rpmts.c:648
+#: lib/rpmts.c:718
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "正在建議：%s\n"
 
-#: lib/rpmts.c:1131
+#: lib/rpmts.c:783
+msgid "    Suggested resolutions:\n"
+msgstr "    推薦解決方案：\n"
+
+#: lib/rpmts.c:1234
 msgid "mounted filesystems:\n"
 msgstr "已掛載的檔案系統：\n"
 
-#: lib/rpmts.c:1133
+#: lib/rpmts.c:1236
 msgid "    i        dev    bsize       bavail       iavail mount point\n"
 msgstr "    i        dev    bsize       bavail       iavail 掛載點\n"
 
-#: lib/rpmts.c:1189
+#: lib/rpmts.c:1292
 #, c-format
 msgid "%5d 0x%08x %8u %12ld %12ld %s\n"
 msgstr "%5d 0x%08x %8u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1516
+#: lib/rpmts.c:1620
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr "產生異動作業記錄板(%p, %p)\n"
 
-#: lib/rpmts.c:1521
+#: lib/rpmts.c:1625
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr "\t記錄板位址： %p\n"
 
-#: lib/rpmts.c:1531
+#: lib/rpmts.c:1635
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\t配置空間給 %d 項條目\n"
 
-#: lib/rpmts.c:1558
+#: lib/rpmts.c:1662
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr "\t加入 %s 的條目到記錄板。\n"
 
-#: lib/rpmts.c:1561
+#: lib/rpmts.c:1665
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr "\t\t條目位址： %p\n"
 
-#: lib/rpmts.c:1572
+#: lib/rpmts.c:1676
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr "\t在記錄板中更新 %s 條目。\n"
 
-#: lib/rpmts.c:1597
+#: lib/rpmts.c:1701
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr "也許會釋放記錄板(%p)\n"
 
-#: lib/rpmts.c:1612
+#: lib/rpmts.c:1716
 msgid "\tRefcount is zero...will free\n"
 msgstr "\t參照數為零…將會釋放\n"
 
-#: lib/rpmts.c:1660
+#: lib/rpmts.c:1764
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr "在記錄板(%p)中查找 %s\n"
 
-#: lib/rpmts.c:1666
+#: lib/rpmts.c:1770
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr "\t找到條目於位址： %p\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:115
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "預期的大小：%12d = lead(%d)+ sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:119
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  實際的大小：%12d\n"
 
-#: lib/signature.c:162
+#: lib/signature.c:159
 #, c-format
 msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "sigh 大小(%d):不當，讀取回傳 %d\n"
 
-#: lib/signature.c:167
+#: lib/signature.c:164
 #, c-format
 msgid "sigh magic: BAD\n"
 msgstr "sigh magic：不當\n"
 
-#: lib/signature.c:173
+#: lib/signature.c:170
 #, c-format
 msgid "sigh tags: BAD, no. of tags(%d) out of range\n"
 msgstr "sigh 標記：不當，號碼的標記(%d)發信匣的範圍\n"
 
-#: lib/signature.c:179
+#: lib/signature.c:176
 #, c-format
 msgid "sigh data: BAD, no. of  bytes(%d) out of range\n"
 msgstr "sigh 資料：不當，號碼的  位元組(%d)發信匣的範圍\n"
 
-#: lib/signature.c:191
+#: lib/signature.c:188
 #, c-format
 msgid "sigh blob(%d): BAD, read returned %d\n"
 msgstr "sigh 萬用字元解析(%d):不當，讀取回傳 %d\n"
 
-#: lib/signature.c:259
+#: lib/signature.c:256
 #, c-format
 msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "sigh 標記[%d]:不當，標記 %d 型態 %d 偏移 %d 計數 %d\n"
 
-#: lib/signature.c:269
+#: lib/signature.c:266
 #, c-format
 msgid "sigh load: BAD\n"
 msgstr "sigh 載入：不當\n"
 
-#: lib/signature.c:281
+#: lib/signature.c:278
 #, c-format
 msgid "sigh pad(%d): BAD, read %d bytes\n"
 msgstr "sigh 填充(%d):不當，讀取 %d 位元組\n"
 
-#: lib/signature.c:290
+#: lib/signature.c:287
 #, c-format
 msgid "sigh sigSize(%d): BAD, fstat(2) failed\n"
 msgstr "sigh sigSize(%d):不當，fstat(2)失敗\n"
 
-#: lib/signature.c:323
+#: lib/signature.c:320
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "簽名：size(%d)+pad(%d)\n"
 
-#: lib/signature.c:407 lib/signature.c:518 lib/signature.c:811
-#: lib/signature.c:844
+#: lib/signature.c:404 lib/signature.c:515 lib/signature.c:808
+#: lib/signature.c:841
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "無法執行 %s: %s\n"
 
-#: lib/signature.c:423
+#: lib/signature.c:420
 msgid "pgp failed\n"
 msgstr "pgp 失敗\n"
 
-#: lib/signature.c:430
+#: lib/signature.c:427
 msgid "pgp failed to write signature\n"
 msgstr "pgp 寫入簽名時失敗\n"
 
-#: lib/signature.c:435
+#: lib/signature.c:432
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP sig 大小：%d\n"
 
-#: lib/signature.c:449 lib/signature.c:561
+#: lib/signature.c:446 lib/signature.c:558
 msgid "unable to read the signature\n"
 msgstr "無法讀取簽名\n"
 
-#: lib/signature.c:454
+#: lib/signature.c:451
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "得到 %d 位元組的 PGP sig\n"
 
-#: lib/signature.c:535
+#: lib/signature.c:532
 #, c-format
 msgid "gpg exec failed (%d)\n"
 msgstr "gpg 執行失敗 (%d)\n"
 
-#: lib/signature.c:542
+#: lib/signature.c:539
 msgid "gpg failed to write signature\n"
 msgstr "寫入簽名時 gpg 失敗\n"
 
-#: lib/signature.c:547
+#: lib/signature.c:544
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG sig 大小：%d\n"
 
-#: lib/signature.c:566
+#: lib/signature.c:563
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "得到 %d 位元組的 GPG sig\n"
 
-#: lib/signature.c:849 lib/signature.c:898
+#: lib/signature.c:846 lib/signature.c:895
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "在巨集檔案中有無效的 %%_signature spec\n"
 
-#: lib/signature.c:880
+#: lib/signature.c:877
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "您必須在您的巨集檔案中設定 \"%%_gpg_name\"\n"
 
-#: lib/signature.c:892
+#: lib/signature.c:889
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "您必須在您的巨集檔案中設定 \"%%_pgp_name\"\n"
 
-#: lib/signature.c:935
+#: lib/signature.c:932
 msgid "Header+Payload size: "
 msgstr "表頭+酬載大小："
 
-#: lib/signature.c:972
+#: lib/signature.c:969
 msgid "MD5 digest: "
 msgstr "MD 5 摘要："
 
-#: lib/signature.c:1028
+#: lib/signature.c:1025
 msgid "Header SHA1 digest: "
 msgstr "表頭 SHA1 摘要："
 
-#: lib/signature.c:1102 lib/signature.c:1280
+#: lib/signature.c:1100 lib/signature.c:1247
 msgid "Header "
 msgstr "表頭 "
 
-#: lib/signature.c:1168
+#: lib/signature.c:1163
 msgid " signature: "
 msgstr " 簽名："
 
-#: lib/signature.c:1286
+#: lib/signature.c:1253
 msgid " DSA signature: "
 msgstr " DSA 簽名："
 
-#: lib/signature.c:1367
+#: lib/signature.c:1332
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "驗證簽名：不當的參數\n"
 
-#: lib/signature.c:1398
+#: lib/signature.c:1363
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "不完整的 MD 5 摘要：不支援\n"
 
-#: lib/signature.c:1402
+#: lib/signature.c:1367
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "簽名：不明 (%d)\n"
 
-#: lib/transaction.c:864
+#: lib/transaction.c:851
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "排除目錄 %s\n"
 
-#: lib/transaction.c:938
+#: lib/transaction.c:925
 msgid "Transaction failed...rolling back\n"
 msgstr "異動作業失敗…返回\n"
 
-#: lib/transaction.c:958
+#: lib/transaction.c:945
 msgid "Could not order auto-rollback transaction!\n"
 msgstr "無法排列自動返回異動作業的順序！\n"
 
-#: lib/transaction.c:1045
+#: lib/transaction.c:1034
 msgid "Getting repackaged header from transaction element\n"
 msgstr "從異動作業元件取得重新包裝的表頭\n"
 
-#: lib/transaction.c:1070
+#: lib/transaction.c:1059
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\t查找 %s…\n"
 
-#: lib/transaction.c:1074
+#: lib/transaction.c:1063
 msgid "\tMatches found.\n"
 msgstr "\t找到相符者。\n"
 
-#: lib/transaction.c:1078
+#: lib/transaction.c:1067
 msgid "\tNo matches found.\n"
 msgstr "\t找不到相符者。\n"
 
-#: lib/transaction.c:1090
+#: lib/transaction.c:1079
 msgid "\tRepackaged package not found!.\n"
 msgstr "\t找不到重新包裝的套件！。\n"
 
-#: lib/transaction.c:1111
+#: lib/transaction.c:1100
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr "\t移除識別號符合安裝識別號。\n"
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1102
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\t名稱： %s。\n"
 
-#: lib/transaction.c:1135
+#: lib/transaction.c:1124
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\t重新包裝的套件是 %s…\n"
 
-#: lib/transaction.c:1174
+#: lib/transaction.c:1163
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr "加入安裝元件到自動返回異動作業。\n"
 
-#: lib/transaction.c:1183
+#: lib/transaction.c:1172
 msgid "Could not get install element database instance!\n"
 msgstr "無法取得安裝元件資料庫實體！\n"
 
-#: lib/transaction.c:1196
+#: lib/transaction.c:1185
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr "無法取得表頭用於自動返回異動作業！\n"
 
-#: lib/transaction.c:1206
+#: lib/transaction.c:1195
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\t已加入重新包裝的套件表頭：%s。\n"
 
-#: lib/transaction.c:1208 lib/transaction.c:1219
+#: lib/transaction.c:1197 lib/transaction.c:1208
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr "\t已從安裝元件 %s 加入。\n"
 
-#: lib/transaction.c:1217
+#: lib/transaction.c:1206
 msgid "\tAdded erase element.\n"
 msgstr "\t已加入清除元件。\n"
 
-#: lib/transaction.c:1226
+#: lib/transaction.c:1215
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr "無法取得重新包裝的表頭用於自動返回異動作業！\n"
 
-#: lib/transaction.c:1233
+#: lib/transaction.c:1222
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr "加入清除元件到自動返回異動作業。\n"
 
-#: lib/transaction.c:1241
+#: lib/transaction.c:1230
 msgid "\tFound existing upgrade element.\n"
 msgstr "\t找到現有升級元件。\n"
 
-#: lib/transaction.c:1242
+#: lib/transaction.c:1231
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr "\t不加入 %s 的清除元件。\n"
 
-#: lib/transaction.c:1259
+#: lib/transaction.c:1248
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\t已加入重新包裝的套件 %s。\n"
 
-#: lib/transaction.c:1261
+#: lib/transaction.c:1250
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\t已從清除元件 %s 加入。\n"
 
-#: lib/transaction.c:1266
+#: lib/transaction.c:1255
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr "無法加入清除元件到自動返回異動作業。\n"
 
-#: lib/transaction.c:1272
+#: lib/transaction.c:1261
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr "\t沒有重新包裝的套件…無事可做。\n"
 
-#: lib/transaction.c:1278
+#: lib/transaction.c:1267
 msgid "Failure reading repackaged package!\n"
 msgstr "讀取重新包裝的套件時失敗！\n"
 
-#: lib/transaction.c:1412
+#: lib/transaction.c:1401
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "明智地檢查 %d 元件\n"
 
-#: lib/transaction.c:1498
+#: lib/transaction.c:1487
 msgid "running pre-transaction scripts\n"
 msgstr "正在執行異動作業前命令稿\n"
 
-#: lib/transaction.c:1565
+#: lib/transaction.c:1554
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "正在計算 %d 個檔案指紋\n"
 
-#: lib/transaction.c:1641
+#: lib/transaction.c:1630
 msgid "computing file dispositions\n"
 msgstr "計算檔案部署\n"
 
-#: lib/transaction.c:1830
+#: lib/transaction.c:1819
 msgid "Creating auto-rollback transaction\n"
 msgstr "產生自動返回異動作業\n"
 
-#: lib/transaction.c:1978
+#: lib/transaction.c:1967
 msgid "Add failed.  Could not read package header.\n"
 msgstr "加入失敗。無法讀取套件表頭。\n"
 
-#: lib/transaction.c:2060
+#: lib/transaction.c:2049
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "加入 rpmpsmStage() 中失敗。\n"
 
-#: lib/transaction.c:2103
+#: lib/transaction.c:2092
 msgid "Add failed.  Could not get file list.\n"
 msgstr "加入失敗。無法取得檔案清單。\n"
 
-#: lib/transaction.c:2149
+#: lib/transaction.c:2138
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "清除 rpmpsmStage() 中檔案失敗。\n"
 
-#: lib/transaction.c:2207
+#: lib/transaction.c:2196
 msgid "running post-transaction scripts\n"
 msgstr "正在執行異動作業後期命令稿\n"
 
-#: lib/verify.c:274
+#: lib/verify.c:275
 #, c-format
 msgid "missing   %c %s"
 msgstr "缺少      %c %s"
@@ -3478,60 +3463,60 @@ msgstr "缺少      %c %s"
 msgid "Unknown system error"
 msgstr "不明的系統：%s\n"
 
-#: rpmdb/db3.c:150
+#: rpmdb/db3.c:151
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr "資料庫%d 錯誤(%d) 來自 %s: %s\n"
 
-#: rpmdb/db3.c:153
+#: rpmdb/db3.c:154
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr "資料庫%d 錯誤(%d): %s\n"
 
-#: rpmdb/db3.c:175
+#: rpmdb/db3.c:176
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr "關閉資料庫環境 %s/%s\n"
 
-#: rpmdb/db3.c:187
+#: rpmdb/db3.c:188
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr "移除資料庫環境 %s/%s\n"
 
-#: rpmdb/db3.c:242
+#: rpmdb/db3.c:243
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr "開啟資料庫環境 %s/%s %s\n"
 
-#: rpmdb/db3.c:681
+#: rpmdb/db3.c:682
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "關閉資料庫索引       %s/%s\n"
 
-#: rpmdb/db3.c:738
+#: rpmdb/db3.c:739
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "已驗證資料庫索引       %s/%s\n"
 
-#: rpmdb/db3.c:949
+#: rpmdb/db3.c:950
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "開啟資料庫索引       %s/%s %s 模式=0x%x\n"
 
-#: rpmdb/db3.c:1161
+#: rpmdb/db3.c:1162
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "無法取得 %s 鎖定於 %s/%s\n"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "exclusive"
 msgstr "互斥"
 
-#: rpmdb/db3.c:1163
+#: rpmdb/db3.c:1164
 msgid "shared"
 msgstr "共享"
 
-#: rpmdb/db3.c:1167
+#: rpmdb/db3.c:1168
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "鎖定的資料庫索引       %s/%s\n"
@@ -3556,76 +3541,76 @@ msgstr "%s 有太大或太小的長整數值，略過\n"
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s 有太大或太小的整數值，略過\n"
 
-#: rpmdb/header.c:2389
+#: rpmdb/header.c:2390
 msgid "missing { after %"
 msgstr "% 之後缺少 {"
 
-#: rpmdb/header.c:2417
+#: rpmdb/header.c:2418
 msgid "missing } after %{"
 msgstr "%{ 之後缺少 }"
 
-#: rpmdb/header.c:2429
+#: rpmdb/header.c:2430
 msgid "empty tag format"
 msgstr "清空標記格式"
 
-#: rpmdb/header.c:2439
+#: rpmdb/header.c:2440
 msgid "empty tag name"
 msgstr "清空標記名稱"
 
-#: rpmdb/header.c:2448
+#: rpmdb/header.c:2449
 msgid "unknown tag"
 msgstr "不明的標記"
 
-#: rpmdb/header.c:2471
+#: rpmdb/header.c:2472
 msgid "] expected at end of array"
 msgstr "] 預期在陣列的結束"
 
-#: rpmdb/header.c:2484
+#: rpmdb/header.c:2485
 msgid "unexpected ]"
 msgstr "未預期的 ]"
 
-#: rpmdb/header.c:2495
+#: rpmdb/header.c:2496
 msgid "unexpected }"
 msgstr "未預期的 }"
 
-#: rpmdb/header.c:2549
+#: rpmdb/header.c:2550
 msgid "? expected in expression"
 msgstr "? 預期於運算式中"
 
-#: rpmdb/header.c:2556
+#: rpmdb/header.c:2557
 msgid "{ expected after ? in expression"
 msgstr "{ 預期於運算式中 ? 之後"
 
-#: rpmdb/header.c:2568 rpmdb/header.c:2608
+#: rpmdb/header.c:2569 rpmdb/header.c:2609
 msgid "} expected in expression"
 msgstr "} 預期於運算式中"
 
-#: rpmdb/header.c:2576
+#: rpmdb/header.c:2577
 msgid ": expected following ? subexpression"
 msgstr "： 預期跟著子運算式"
 
-#: rpmdb/header.c:2594
+#: rpmdb/header.c:2595
 msgid "{ expected after : in expression"
 msgstr "{ 預期於運算式中 : 之後"
 
-#: rpmdb/header.c:2616
+#: rpmdb/header.c:2617
 msgid "| expected at end of expression"
 msgstr "| 預期於運算式的結束"
 
-#: rpmdb/header.c:2706
+#: rpmdb/header.c:2707
 msgid "(index out of range)"
 msgstr "(索引超出範圍)"
 
-#: rpmdb/header.c:2911
+#: rpmdb/header.c:2912
 msgid "array iterator used with different sized arrays"
 msgstr "用於不同大小陣列的陣列迭代器"
 
-#: rpmdb/header.c:3195
+#: rpmdb/header.c:3196
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3211
+#: rpmdb/header.c:3212
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -3646,383 +3631,369 @@ msgstr "從安裝的套件表頭重建資料庫的反相清單"
 msgid "verify database files"
 msgstr "驗證資料庫檔案"
 
-#: rpmdb/poptDB.c:25
-msgid "generate headers compatible with (legacy) rpm[23] packaging"
-msgstr "產生與(舊的) rpm[23] 包裝相容的表頭"
-
-#: rpmdb/rpmdb.c:175
+#: rpmdb/rpmdb.c:179
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit：無法辨識的標記名稱：\"%s\"忽略\n"
 
-#: rpmdb/rpmdb.c:248
+#: rpmdb/rpmdb.c:252
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "無法使用資料庫 %2$d- %3$s(%4$d) 開啟 %1$s 索引\n"
 
-#: rpmdb/rpmdb.c:268
+#: rpmdb/rpmdb.c:272
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "無法開啟 %s 索引\n"
 
-#: rpmdb/rpmdb.c:904
+#: rpmdb/rpmdb.c:908
 msgid "no dbpath has been set\n"
 msgstr "沒有 dbpath 已被設定\n"
 
-#: rpmdb/rpmdb.c:1141 rpmdb/rpmdb.c:1266 rpmdb/rpmdb.c:1316 rpmdb/rpmdb.c:2220
-#: rpmdb/rpmdb.c:2339 rpmdb/rpmdb.c:3051
+#: rpmdb/rpmdb.c:1145 rpmdb/rpmdb.c:1270 rpmdb/rpmdb.c:1320 rpmdb/rpmdb.c:2224
+#: rpmdb/rpmdb.c:2343 rpmdb/rpmdb.c:3038
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "從 %3$s 索引取得 \"%2$s\" 記錄時產生錯誤(%1$d)\n"
 
-#: rpmdb/rpmdb.c:1491
+#: rpmdb/rpmdb.c:1495
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader：跳過"
 
-#: rpmdb/rpmdb.c:1501
+#: rpmdb/rpmdb.c:1505
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "儲存記錄 #%2$d 進入 %3$s 時產生錯誤(%1$d)\n"
 
-#: rpmdb/rpmdb.c:2117
+#: rpmdb/rpmdb.c:2121
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator：跳過"
 
-#: rpmdb/rpmdb.c:2146
+#: rpmdb/rpmdb.c:2150
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb：已取回損壞的表頭 #%u -- 跳過。\n"
 
-#: rpmdb/rpmdb.c:2440
+#: rpmdb/rpmdb.c:2444
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 無法讀取在 0x%x 的表頭\n"
 
-#: rpmdb/rpmdb.c:2498
+#: rpmdb/rpmdb.c:2502
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "設定用於 %3$s 撤除的表頭 #%2$d 記錄時產生錯誤(%1$d)\n"
 
-#: rpmdb/rpmdb.c:2605
+#: rpmdb/rpmdb.c:2602
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "正在從 %1$s 索引移除 \"%2$s\"。\n"
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2606
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "正在從 %2$s 索引移除 %1$d 項條目。\n"
 
-#: rpmdb/rpmdb.c:2636
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "從 %3$s 索引設定 \"%2$s\" 記錄時產生錯誤(%1$d)\n"
 
-#: rpmdb/rpmdb.c:2655
+#: rpmdb/rpmdb.c:2652
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "儲存記錄 \"%2$s\" 進入 %3$s 時產生錯誤(%1$d)\n"
 
-#: rpmdb/rpmdb.c:2665
+#: rpmdb/rpmdb.c:2662
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "從 %3$s 移除記錄 \"%2$s\" 時產生錯誤(%1$d)\n"
 
-#: rpmdb/rpmdb.c:2815
+#: rpmdb/rpmdb.c:2809
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "配置新套件實體時產生錯誤(%d)\n"
 
-#: rpmdb/rpmdb.c:2871
+#: rpmdb/rpmdb.c:2865
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd：跳過"
 
-#: rpmdb/rpmdb.c:3027
+#: rpmdb/rpmdb.c:3014
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "正在加入 \"%s\" 到 %s 索引。\n"
 
-#: rpmdb/rpmdb.c:3031
+#: rpmdb/rpmdb.c:3018
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "正在加入 %d 項條目到 %s 索引。\n"
 
-#: rpmdb/rpmdb.c:3067
+#: rpmdb/rpmdb.c:3054
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "儲存記錄 %2$s 於 %3$s 時產生錯誤(%1$d)\n"
 
-#: rpmdb/rpmdb.c:3423
+#: rpmdb/rpmdb.c:3410
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "成功重建 db3 之後移除 %s。\n"
 
-#: rpmdb/rpmdb.c:3454
+#: rpmdb/rpmdb.c:3441
 msgid "no dbpath has been set"
 msgstr "沒有 dbpath 已被設定"
 
-#: rpmdb/rpmdb.c:3480
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "重建資料庫 %s 於 %s\n"
 
-#: rpmdb/rpmdb.c:3484
+#: rpmdb/rpmdb.c:3471
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "臨時資料庫 %s 已經存在\n"
 
-#: rpmdb/rpmdb.c:3490
+#: rpmdb/rpmdb.c:3477
 #, c-format
 msgid "creating directory %s\n"
 msgstr "產生目錄 %s\n"
 
-#: rpmdb/rpmdb.c:3492
+#: rpmdb/rpmdb.c:3479
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "產生目錄 %s: %s\n"
 
-#: rpmdb/rpmdb.c:3501
+#: rpmdb/rpmdb.c:3488
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "以 dbapi %d 開啟舊的資料庫\n"
 
-#: rpmdb/rpmdb.c:3510
+#: rpmdb/rpmdb.c:3497
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "以 dbapi %d 開啟新的資料庫\n"
 
-#: rpmdb/rpmdb.c:3539
+#: rpmdb/rpmdb.c:3526
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "在資料庫中有不當的表頭 #%u -- 跳過。\n"
 
-#: rpmdb/rpmdb.c:3577
+#: rpmdb/rpmdb.c:3564
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "無法加入原本在 %u 的記錄\n"
 
-#: rpmdb/rpmdb.c:3591
+#: rpmdb/rpmdb.c:3578
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "重建資料庫時失敗：原來的資料庫保持原狀\n"
 
-#: rpmdb/rpmdb.c:3599
+#: rpmdb/rpmdb.c:3586
 msgid "failed to replace old database with new database!\n"
 msgstr "以新的資料庫取代舊的資料庫時失敗！\n"
 
-#: rpmdb/rpmdb.c:3601
+#: rpmdb/rpmdb.c:3588
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "以 %2$s 的檔案取代 %1$s 中的檔案來回復"
 
-#: rpmdb/rpmdb.c:3611
+#: rpmdb/rpmdb.c:3598
 #, c-format
 msgid "removing directory %s\n"
 msgstr "移除目錄 %s\n"
 
-#: rpmdb/rpmdb.c:3613
+#: rpmdb/rpmdb.c:3600
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "移除目錄時失敗 %s: %s\n"
 
-#: rpmdb/sqlite.c:594
+#: rpmdb/sqlite.c:596
 #, c-format
 msgid "Unable to get lock on db %s, retrying... (%d)\n"
 msgstr ""
 
-#: rpmdb/sqlite.c:745
+#: rpmdb/sqlite.c:747
 #, fuzzy, c-format
 msgid "closed   sql db         %s\n"
 msgstr "關閉資料庫索引       %s/%s\n"
 
-#: rpmdb/sqlite.c:836
+#: rpmdb/sqlite.c:838
 #, fuzzy, c-format
 msgid "opening  sql db         %s (%s) mode=0x%x\n"
 msgstr "開啟資料庫索引       %s/%s %s 模式=0x%x\n"
 
-#: rpmio/macro.c:190
+#: rpmio/macro.c:181
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== 作用中 %d 清空 %d\n"
 
-#: rpmio/macro.c:330
+#: rpmio/macro.c:321
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(清空)"
 
-#: rpmio/macro.c:371
+#: rpmio/macro.c:362
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(清空)\n"
 
-#: rpmio/macro.c:522 rpmio/macro.c:962 rpmio/macro.c:993 rpmio/macro.c:1701
+#: rpmio/macro.c:489 rpmio/macro.c:929 rpmio/macro.c:960 rpmio/macro.c:1423
 msgid "Target buffer overflow\n"
 msgstr "目標緩衝區溢位\n"
 
-#: rpmio/macro.c:582 rpmio/macro.c:620
+#: rpmio/macro.c:549 rpmio/macro.c:587
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "巨集 %%%s 具有未終結的主體\n"
 
-#: rpmio/macro.c:639
+#: rpmio/macro.c:606
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "巨集 %%%s 具有不合法的名稱 (%%define)\n"
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:612
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "巨集 %%%s 具有未終結的選項\n"
 
-#: rpmio/macro.c:650
+#: rpmio/macro.c:617
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "巨集 %%%s 具有清空的主體\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "巨集 %%%s 展開時失敗\n"
 
-#: rpmio/macro.c:687
+#: rpmio/macro.c:654
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "巨集 %%%s 具有不合法的名稱 (%%undefine)\n"
 
-#: rpmio/macro.c:788
+#: rpmio/macro.c:755
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "巨集 %%%s (%s) 在等級 %d 之下未被使用\n"
 
-#: rpmio/macro.c:907
+#: rpmio/macro.c:874
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "在 %2$s(%3$s) 中有不明的選項 %1$c\n"
 
-#: rpmio/macro.c:1102
+#: rpmio/macro.c:1069
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "遞迴深度(%d)大於最大值(%d)\n"
 
-#: rpmio/macro.c:1171 rpmio/macro.c:1188
+#: rpmio/macro.c:1138 rpmio/macro.c:1155
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "未終結的 %c: %s\n"
 
-#: rpmio/macro.c:1229
+#: rpmio/macro.c:1196
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "在無法解析的巨集之後跟著一個 %%\n"
 
-#: rpmio/macro.c:1385
+#: rpmio/macro.c:1352
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "找不到巨集 %%%.*s，跳過\n"
 
-#: rpmio/macro.c:1904 rpmio/macro.c:1910
-#, c-format
-msgid "File %s: %s\n"
-msgstr "檔案 %s: %s\n"
-
-#: rpmio/macro.c:1913
-#, c-format
-msgid "File %s is smaller than %u bytes\n"
-msgstr "檔案 %s 小於 %u 位元組\n"
-
-#: rpmio/rpmlua.c:450
+#: rpmio/rpmlua.c:451
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "不支援舊語法：%s\n"
 
-#: rpmio/rpmlua.c:466
+#: rpmio/rpmlua.c:467
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "不支援舊語法：%s\n"
 
-#: rpmio/rpmlua.c:471 rpmio/rpmlua.c:490
+#: rpmio/rpmlua.c:472 rpmio/rpmlua.c:491
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite 失敗：%s\n"
 
-#: rpmio/rpmlua.c:485
+#: rpmio/rpmlua.c:486
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "不正確的套件編號：%s\n"
 
-#: rpmio/rpmlua.c:620
+#: rpmio/rpmlua.c:621
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s：檢索失敗：%s\n"
 
-#: rpmio/rpmio.c:496
+#: rpmio/rpmio.c:473
 msgid "Success"
 msgstr "成功"
 
-#: rpmio/rpmio.c:519
+#: rpmio/rpmio.c:496
 msgid "Bad server response"
 msgstr "不當的伺服器回應"
 
-#: rpmio/rpmio.c:521
+#: rpmio/rpmio.c:498
 msgid "Server I/O error"
 msgstr "伺服器 I/O 錯誤"
 
-#: rpmio/rpmio.c:523
+#: rpmio/rpmio.c:500
 msgid "Server timeout"
 msgstr "伺服器逾時"
 
-#: rpmio/rpmio.c:525
+#: rpmio/rpmio.c:502
 msgid "Unable to lookup server host address"
 msgstr "無法查找伺服器主機位址"
 
-#: rpmio/rpmio.c:527
+#: rpmio/rpmio.c:504
 msgid "Unable to lookup server host name"
 msgstr "無法查找伺服器主機名稱"
 
-#: rpmio/rpmio.c:529
+#: rpmio/rpmio.c:506
 msgid "Failed to connect to server"
 msgstr "連接到伺服器時失敗"
 
-#: rpmio/rpmio.c:531
+#: rpmio/rpmio.c:508
 msgid "Failed to establish data connection to server"
 msgstr "建立資料連接到伺服器時失敗"
 
-#: rpmio/rpmio.c:533
+#: rpmio/rpmio.c:510
 msgid "I/O error to local file"
 msgstr "到本機檔案的 I/O 錯誤"
 
-#: rpmio/rpmio.c:535
+#: rpmio/rpmio.c:512
 msgid "Error setting remote server to passive mode"
 msgstr "設定遠端伺服器為被動模式時發生錯誤"
 
-#: rpmio/rpmio.c:537
+#: rpmio/rpmio.c:514
 msgid "File not found on server"
 msgstr "在伺服器上找不到檔案"
 
-#: rpmio/rpmio.c:539
+#: rpmio/rpmio.c:516
 msgid "Abort in progress"
 msgstr "正在進行放棄"
 
-#: rpmio/rpmio.c:543
+#: rpmio/rpmio.c:520
 msgid "Unknown or unexpected error"
 msgstr "不明的或非預期錯誤"
 
-#: rpmio/rpmio.c:813
+#: rpmio/rpmio.c:756
 #, fuzzy, c-format
 msgid "URL helper failed: %s (%d)\n"
 msgstr "讀取失敗：%s (%d)\n"
 
-#: rpmio/rpmlog.c:43
+#: rpmio/rpmlog.c:30
 msgid "(no error)"
 msgstr "(無錯誤)"
 
-#: rpmio/rpmlog.c:112 rpmio/rpmlog.c:113 rpmio/rpmlog.c:114
+#: rpmio/rpmlog.c:99 rpmio/rpmlog.c:100 rpmio/rpmlog.c:101
 msgid "fatal error: "
 msgstr "嚴重錯誤："
 
-#: rpmio/rpmlog.c:115
+#: rpmio/rpmlog.c:102
 msgid "error: "
 msgstr "錯誤："
 
-#: rpmio/rpmlog.c:116
+#: rpmio/rpmlog.c:103
 msgid "warning: "
 msgstr "警告："
 
@@ -4031,41 +4002,73 @@ msgstr "警告："
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "記憶體配置 (%u 位元組) 回傳空值。\n"
 
-#: rpmio/url.c:213
+#: rpmio/url.c:215
 msgid "url port must be a number\n"
 msgstr "網址連接埠必須是數字\n"
 
-#: rpmio/url.c:278
+#: rpmio/url.c:280
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "建立 %s 時失敗: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:265
+#: tools/rpmcache.c:516 tools/rpmgraph.c:253
 msgid "don't verify header+payload signature"
 msgstr "不驗證表頭+酬載簽名"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:519
 msgid "don't update cache database, only print package paths"
 msgstr "不更新快取資料庫，只有印出套件路徑"
 
-#: tools/rpmcache.c:520
+#: tools/rpmcache.c:522
 msgid "File tree walk options:"
 msgstr "檔案樹遍歷選項："
 
-#: tools/rpmcache.c:556
+#: tools/rpmcache.c:558
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: %%{_cache_dbpath } 巨集設定錯誤。\n"
 
-#: tools/rpmcache.c:596
+#: tools/rpmcache.c:598
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: 快取作業失敗：ec %d。\n"
 
-#: tools/rpmgraph.c:170
+#: tools/rpmgraph.c:169
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: 讀取清單失敗：%s\n"
 
+#~ msgid "readRPM: read %s: %s\n"
+#~ msgstr "readRPM：讀取 %s：%s\n"
+
+#~ msgid "Unable to write final header\n"
+#~ msgstr "無法寫入表頭結尾\n"
+
+#~ msgid "error creating temporary file %s\n"
+#~ msgstr "建立暫時檔案 %s 時發生錯誤\n"
+
+#~ msgid "packaging version 1 is not supported by this version of RPM\n"
+#~ msgstr "此 RPM 版本不支援第 1 版的打包\n"
+
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr "此 RPM 版本只支援主版本號 <=4 的打包\n"
+
+#~ msgid "%s: Can't sign v1 packaging\n"
+#~ msgstr "%s：無法對 v1 版打包簽名\n"
+
+#~ msgid "%s: Can't re-sign v2 packaging\n"
+#~ msgstr "%s：無法對 v2 版打包重新簽名\n"
+
+#~ msgid "%s: No signature available (v1.0 RPM)\n"
+#~ msgstr "%s：無可用簽名 (v1.0 RPM)\n"
+
+#~ msgid "File %s: %s\n"
+#~ msgstr "檔案 %s: %s\n"
+
+#~ msgid "File %s is smaller than %u bytes\n"
+#~ msgstr "檔案 %s 小於 %u 位元組\n"
+
 #~ msgid "Unsatisfied dependencies for %s: "
 #~ msgstr "無法滿足 %s 的相依性："