Fix gpg-preset-passphrase bug.

Cleanups

1 files changed, 135 insertions, 130 deletions

diff --git a/po/ca.po b/po/ca.po
index 021a4530a..3ce2f2e19 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"POT-Creation-Date: 2008-09-01 08:59+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -113,8 +113,8 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
-#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
+#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -124,10 +124,10 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
 #: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -1165,7 +1165,7 @@ msgstr ""
 # Destès? ivb
 # Desatès, sí. jm
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
@@ -3442,20 +3442,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3588
+#: g10/keyedit.c:1142 g10/keygen.c:3596
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3583 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3591
+#: g10/keyedit.c:1150 g10/keygen.c:3599
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3595
+#: g10/keyedit.c:1154 g10/keygen.c:3603
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
@@ -3472,7 +3472,7 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2150
+#: g10/keyedit.c:1199 g10/keygen.c:2158
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
@@ -4304,12 +4304,12 @@ msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
 #: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
-#: g10/keygen.c:3088
+#: g10/keygen.c:3096
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3102
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4449,7 +4449,7 @@ msgstr "La grandària sol·licitada és %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1841
+#: g10/keygen.c:1843
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4465,7 +4465,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1852
+#: g10/keygen.c:1854
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4481,42 +4481,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1875
+#: g10/keygen.c:1877
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1880
+#: g10/keygen.c:1882
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1898
+#: g10/keygen.c:1900 g10/keygen.c:1925
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1907
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1906
+#: g10/keygen.c:1908
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1913
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1912
+#: g10/keygen.c:1914
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1916
+#: g10/keygen.c:1918
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4524,19 +4524,19 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1931
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1956
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1967
 #, fuzzy
 msgid ""
 "\n"
@@ -4553,44 +4553,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1986
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1994
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1988
+#: g10/keygen.c:1996
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2006
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:2004
+#: g10/keygen.c:2012
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2020
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:2018
+#: g10/keygen.c:2026
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:2040
+#: g10/keygen.c:2048
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:2046
+#: g10/keygen.c:2054
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4601,7 +4601,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2051
+#: g10/keygen.c:2059
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
@@ -4618,23 +4618,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2067
+#: g10/keygen.c:2075
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2085
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2144
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4642,12 +4642,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:2151
+#: g10/keygen.c:2159
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2157
+#: g10/keygen.c:2165
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4659,7 +4659,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2181
+#: g10/keygen.c:2189
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4671,53 +4671,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:3028 g10/keygen.c:3055
+#: g10/keygen.c:3036 g10/keygen.c:3063
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:3260 g10/keygen.c:3427
+#: g10/keygen.c:3268 g10/keygen.c:3435
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:3262 g10/keygen.c:3430
+#: g10/keygen.c:3270 g10/keygen.c:3438
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:3265 g10/keygen.c:3433
+#: g10/keygen.c:3273 g10/keygen.c:3441
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3414
+#: g10/keygen.c:3422
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3421
+#: g10/keygen.c:3429
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3441
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3449
+#: g10/keygen.c:3457
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3476
+#: g10/keygen.c:3484
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3487
+#: g10/keygen.c:3495
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4726,13 +4726,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
-#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
+#: g10/keygen.c:3508 g10/keygen.c:3653 g10/keygen.c:3774
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
+#: g10/keygen.c:3563 g10/keygen.c:3704 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4741,7 +4741,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
+#: g10/keygen.c:3565 g10/keygen.c:3706 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4749,26 +4749,26 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3568 g10/keygen.c:3709
+#: g10/keygen.c:3576 g10/keygen.c:3717
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3609 g10/keygen.c:3742
+#: g10/keygen.c:3617 g10/keygen.c:3750
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3915
+#: g10/keygen.c:3923
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3963
+#: g10/keygen.c:3971
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3989
+#: g10/keygen.c:3997
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -6293,12 +6293,12 @@ msgstr "error de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1448
+#: g10/tdbio.c:128 g10/tdbio.c:1449
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1455
+#: g10/tdbio.c:135 g10/tdbio.c:1456
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -6345,82 +6345,82 @@ msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:611
+#: g10/tdbio.c:612
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:620
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:652
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:660
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1380 g10/tdbio.c:1407
+#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
+#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:736
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1176
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1184
+#: g10/tdbio.c:1185
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1205
+#: g10/tdbio.c:1206
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1223
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1228
+#: g10/tdbio.c:1229
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1413
+#: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1431
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1461
+#: g10/tdbio.c:1462
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
-#: g10/tdbio.c:1506
+#: g10/tdbio.c:1507
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "la base de dades de confiança està corrompuda; per favor, executeu «gpg --fix-"
@@ -6780,12 +6780,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
-#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
+#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6797,98 +6797,103 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+#: scd/app-nks.c:555 scd/app-openpgp.c:1747
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:599
+#: scd/app-openpgp.c:602
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: scd/app-openpgp.c:612
+#: scd/app-openpgp.c:615
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: scd/app-openpgp.c:1007
+#: scd/app-openpgp.c:1011
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
+#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
+#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
+#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1307
+#: scd/app-openpgp.c:1352
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1314
+#: scd/app-openpgp.c:1359
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1333
+#: scd/app-openpgp.c:1378
 #, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1367
+#: scd/app-openpgp.c:1412
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1424
+#, fuzzy
+msgid "||Please enter the PIN"
+msgstr "canvia la contrasenya"
+
+#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2387
+#: scd/app-openpgp.c:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
+#: scd/app-openpgp.c:2436
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1466
+#: scd/app-openpgp.c:1511
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
+#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1500
+#: scd/app-openpgp.c:1545
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1555
 #, c-format
 msgid ""
 "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
 "%d]"
 msgstr ""
 
-#: scd/app-openpgp.c:1525
+#: scd/app-openpgp.c:1570
 #, fuzzy
 msgid "|A|Please enter the Admin PIN at the reader's keypad"
 msgstr "canvia la contrasenya"
@@ -6896,103 +6901,103 @@ msgstr "canvia la contrasenya"
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep
 #. it at the start of the string.  We need this elsewhere to
 #. get some infos on the string.
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1590
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1698
+#: scd/app-openpgp.c:1747
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
+#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:1768
+#: scd/app-openpgp.c:1817
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1821
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1823
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:1941
+#: scd/app-openpgp.c:1990
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1997
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2004
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
+#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2033
+#: scd/app-openpgp.c:2082
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-openpgp.c:2093
+#: scd/app-openpgp.c:2142
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2107
+#: scd/app-openpgp.c:2156
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2110
+#: scd/app-openpgp.c:2159
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2216
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2217
+#: scd/app-openpgp.c:2266
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2305
+#: scd/app-openpgp.c:2354
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:2415
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2701
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7986,7 +7991,7 @@ msgstr "error en crear «%s»: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keylist.c:618
+#: sm/keylist.c:620
 msgid "Error - "
 msgstr ""
 
@@ -8302,12 +8307,12 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3001
+#: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3151
+#: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
 msgstr ""