msgfmt updated.

19 files changed, 11684 insertions, 8056 deletions

diff --git a/po/ca.po b/po/ca.po
index 2d912f147..1065a477b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-06-03 20:37+0200\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -18,39 +18,44 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
-msgid "Warning: using insecure memory!\n"
+#: util/secmem.c:88
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Alerta: esteu usant mem�ria insegura!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:89
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr ""
+
+#: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:327
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:296 util/miscutil.c:331
 msgid "yes"
 msgstr "s�"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:297 util/miscutil.c:334
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:298 util/miscutil.c:332
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:299 util/miscutil.c:335
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "eixir"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:336
 msgid "qQ"
 msgstr "qQ"
 
@@ -259,73 +264,74 @@ msgstr "clau p�blica inusable"
 msgid "unusable secret key"
 msgstr "clau secreta inusable"
 
-#: util/logger.c:224
+#: util/errors.c:107
+#, fuzzy
+msgid "keyserver error"
+msgstr "error general"
+
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... a�� �s un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir �%s�: %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no es pot fer stat de �%s�: %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "�%s� no �s un fitxer regular: s'ignorar�\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fitxer random_seed �s buit\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "alerta: el tamany del fitxer random_seed no �s v�lid - no s'usar�\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no s'ha pogut llegir �%s�: %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear �%s�: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no s'ha pogut escriure �%s�: %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no s'ha pogut tancar `%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "massa bits aleatoris sol�licitats; el l�mit �s %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ALERTA: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -339,7 +345,7 @@ msgstr ""
 "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -348,9 +354,10 @@ msgid ""
 msgstr ""
 "\n"
 "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa perqu� el\n"
-"sistema tinga oportunitat de recollir m�s entropia. (Fan falta %d bytes m�s)\n"
+"sistema tinga oportunitat de recollir m�s entropia. (Fan falta %d bytes "
+"m�s)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -358,139 +365,170 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/g10.c:219
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/g10.c:220
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:221
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/g10.c:222
+#: g10/g10.c:310
+msgid "|[files]|encrypt files"
+msgstr ""
+
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "xifra nom�s amb xifratge sim�tric"
 
-#: g10/g10.c:223
+#: g10/g10.c:312
 msgid "store only"
 msgstr "nom�s emmagatzema"
 
-#: g10/g10.c:224
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/g10.c:225
+#: g10/g10.c:314
+msgid "|[files]|decrypt files"
+msgstr ""
+
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/g10.c:227
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/g10.c:229
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
-#: g10/g10.c:230
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "comprova les signatures de les claus"
 
-#: g10/g10.c:231
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes dactilars"
 
-#: g10/g10.c:232
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/g10.c:233
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/g10.c:234
-msgid "remove key from the public keyring"
+#: g10/g10.c:324
+#, fuzzy
+msgid "remove keys from the public keyring"
 msgstr "elimina una clau de l'anell p�blic"
 
-#: g10/g10.c:236
-msgid "remove key from the secret keyring"
+#: g10/g10.c:326
+#, fuzzy
+msgid "remove keys from the secret keyring"
 msgstr "elimina clau de l'anell secret"
 
-#: g10/g10.c:237
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "firma una clau"
 
-#: g10/g10.c:238
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "signa localment una clau"
 
-#: g10/g10.c:239
+#: g10/g10.c:329
+#, fuzzy
+msgid "sign a key non-revocably"
+msgstr "signa localment una clau"
+
+#: g10/g10.c:330
+#, fuzzy
+msgid "sign a key locally and non-revocably"
+msgstr "signa localment una clau"
+
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/g10.c:240
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocament"
 
-#: g10/g10.c:241
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/g10.c:242
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/g10.c:243
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/g10.c:247
+#: g10/g10.c:338
+#, fuzzy
+msgid "search for keys on a key server"
+msgstr "exporta claus a un servidor de claus"
+
+#: g10/g10.c:340
+#, fuzzy
+msgid "update all keys from a keyserver"
+msgstr "importa claus d'un servidor de claus"
+
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/g10.c:249
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "llista nom�s la seq��ncia de paquets"
 
-#: g10/g10.c:251
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporta els valors de confian�a"
 
-#: g10/g10.c:253
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa els valors de confian�a"
 
-#: g10/g10.c:255
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confian�a"
 
-#: g10/g10.c:257
-msgid "|[NAMES]|check the trust database"
-msgstr "|[NOMS]|comprova la base de dades de confian�a"
+#: g10/g10.c:354
+#, fuzzy
+msgid "unattended trust database update"
+msgstr "actualitza la base de dades de confian�a"
 
-#: g10/g10.c:258
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de dades de confian�a corrompuda"
 
-#: g10/g10.c:259
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "lleva l'armadura a un fitxer o a stdin"
 
-#: g10/g10.c:261
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armadura a un fitxer o a stdin"
 
-#: g10/g10.c:263
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]imprimeix digests de missatges"
 
-#: g10/g10.c:267
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -500,158 +538,204 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/g10.c:271
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/g10.c:274
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: g10/g10.c:276
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa la clau predeterminada com a destinatari predeterminat"
 
-#: g10/g10.c:280
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/g10.c:281
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressi� N (0 no comprimeix)"
 
-#: g10/g10.c:283
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usa mode de text can�nic"
 
-#: g10/g10.c:284
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Cal comprovar el context. jm
-#: g10/g10.c:285
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "detall"
 
-#: g10/g10.c:286
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "una mica m�s silenci�s"
 
-#: g10/g10.c:287
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: g10/g10.c:288
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "for�a signatures v3"
 
-#: g10/g10.c:289
+#: g10/g10.c:394
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "for�a signatures v3"
+
+#: g10/g10.c:395
+#, fuzzy
+msgid "force v4 key signatures"
+msgstr "for�a signatures v3"
+
+#: g10/g10.c:396
+#, fuzzy
+msgid "do not force v4 key signatures"
+msgstr "for�a signatures v3"
+
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "sempre utilitza un MDC per a xifrar"
 
-#: g10/g10.c:290
+#: g10/g10.c:399
+#, fuzzy
+msgid "never use a MDC for encryption"
+msgstr "sempre utilitza un MDC per a xifrar"
+
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "utilitza el gpg-agent"
 
-#: g10/g10.c:293
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "mode batch: no pregunta mai"
 
-#: g10/g10.c:294
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "suposa �s�� en la majoria de les preguntes"
 
-#: g10/g10.c:295
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "suposa �no� en la majoria de les preguntes"
 
-#: g10/g10.c:296
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: g10/g10.c:297
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: g10/g10.c:298
+#: g10/g10.c:411
+msgid "show which keyring a listed key is on"
+msgstr ""
+
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/g10.c:299
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a buscar claus"
 
-#: g10/g10.c:300
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|el joc de car�cters ser� NOM"
 
-#: g10/g10.c:301
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "llig opcions del fitxer"
 
-#: g10/g10.c:305
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informaci� d'estat en aquest FD"
 
-#: g10/g10.c:310
+#: g10/g10.c:424
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|escriu informaci� d'estat en aquest FD"
+
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCLAU|confia definitivament en aquesta clau"
 
-#: g10/g10.c:311
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FITXER|carrega el m�dul d'extensi� especificat"
 
-#: g10/g10.c:312
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el mode descrit en RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "estableix totes les opcions de paquets, xifrat i digest al comportament d'OpenPGP"
+msgstr ""
+"estableix totes les opcions de paquets, xifrat i digest al comportament "
+"d'OpenPGP"
 
-#: g10/g10.c:314
+#: g10/g10.c:440
+#, fuzzy
+msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+msgstr ""
+"estableix totes les opcions de paquets, xifrat i digest al comportament "
+"d'OpenPGP"
+
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: g10/g10.c:316
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|usa l'algoritme de digest de missatges NOM per a les contrasenyes"
 
-#: g10/g10.c:318
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: g10/g10.c:319
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: g10/g10.c:320
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de digest de missatges NOM"
 
-#: g10/g10.c:321
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressi� N"
 
 # elimina o descarta? jm
-#: g10/g10.c:322
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta el camp keyid dels paquets xifrats"
 
-#: g10/g10.c:323
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOM=VALOR|usa aquesta notaci� de dades"
+#: g10/g10.c:457
+msgid "Show Photo IDs"
+msgstr ""
 
-#: g10/g10.c:326
+#: g10/g10.c:458
+msgid "Don't show Photo IDs"
+msgstr ""
+
+#: g10/g10.c:459
+msgid "Set command line to view Photo IDs"
+msgstr ""
+
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -659,7 +743,7 @@ msgstr ""
 "@\n"
 "(En la p�gina del man hi ha una llista completa d'ordres i d'opcions)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -679,15 +763,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes dactilars\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favor informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:445
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -697,7 +781,7 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operaci� predeterminada dep�n de les dades introdu�des\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -705,341 +789,427 @@ msgstr ""
 "\n"
 "Algoritmes admesos:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "�s: gpg [opcions] "
 
-#: g10/g10.c:584
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "ordres en conflicte\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminat �%s�\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions �%s�: %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "llegint opcions de �%s�\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no �s un joc de car�cters v�lid\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1341
+msgid "could not parse keyserver URI\n"
+msgstr ""
+
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: versi� de fitxer %d inv�lid\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "armadura inv�lida"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: versi� de fitxer %d inv�lid\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "l'anell no �s v�lid"
+
+#: g10/g10.c:1369
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "ALERTA: el programa podria crear un fitxer core!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1510
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr ""
+
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no �s per a �s normal!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no �s perm�s amb %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no t� sentit amb %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1549
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/g10.c:1555
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/g10.c:1561
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr ""
+
+#: g10/g10.c:1574
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr ""
+
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
+msgid "this message may not be usable by PGP 2.x\n"
+msgstr ""
+
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algorime de digest seleccionat no �s v�lid\n"
 
-#: g10/g10.c:1075
-msgid "the given policy URL is invalid\n"
-msgstr "la URL de pol�tica donada no �s v�lida\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "el algorime de digest seleccionat no �s v�lid\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritme de compressi� ha d'estar en l'interval %d..%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ha d'estar entre el rang 1 a 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K inv�lid; ha de ser 0, 1 o 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1679
+#, fuzzy
+msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
+msgstr "mode S2K inv�lid; ha de ser 0, 1 o 3\n"
+
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "llista les prefer�ncies"
+
+#: g10/g10.c:1693
+msgid "invalid personal cipher preferences\n"
+msgstr ""
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "llista les prefer�ncies"
+
+#: g10/g10.c:1701
+msgid "invalid personal compress preferences\n"
+msgstr ""
+
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1874
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [nom_del_fitxer]"
+
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1278
-msgid "--edit-key user-id [commands]"
-msgstr "--edit-key user-id [ordres]"
-
-#: g10/g10.c:1294
-msgid "--delete-secret-key user-id"
-msgstr "--delete-secret-key user-id"
+#: g10/g10.c:1928
+#, fuzzy
+msgid "--nrsign-key user-id"
+msgstr "--sign-key user-id"
 
-#: g10/g10.c:1297
-msgid "--delete-key user-id"
-msgstr "--delete-key user-id"
+#: g10/g10.c:1936
+#, fuzzy
+msgid "--nrlsign-key user-id"
+msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1305
-msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-and-public-key user-id"
+#: g10/g10.c:1944
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [ordres]"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr ""
 "algoritme de hash inv�lid �%s�\n"
 "\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir �%s�\n"
 
-#: g10/g10.c:1805
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "el primer car�cter de la notaci� ha de ser una lletra o un subratllat\n"
-
-#: g10/g10.c:1811
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
-msgstr "el nom de la notaci� nom�s pot tenir lletres, d�gits, punts o subratllats i acabar amb el signe �=�\n"
-
-#: g10/g10.c:1817
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "els punts han d'estar envoltat per altres car�cters\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"el nom de la notaci� nom�s pot tenir lletres, d�gits, punts o subratllats i "
+"acabar amb el signe �=�\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
 
-#: g10/armor.c:306
+#: g10/g10.c:2555
+#, fuzzy
+msgid "the given certification policy URL is invalid\n"
+msgstr "la URL de pol�tica donada no �s v�lida\n"
+
+#: g10/g10.c:2557
+#, fuzzy
+msgid "the given signature policy URL is invalid\n"
+msgstr "la URL de pol�tica donada no �s v�lida\n"
+
+#: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:335
+#: g10/armor.c:343
 msgid "invalid armor header: "
 msgstr "cap�alera d'armadura no v�lida: "
 
-#: g10/armor.c:342
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr "cap�alera d'armadura: "
 
-#: g10/armor.c:353
+#: g10/armor.c:361
 msgid "invalid clearsig header\n"
 msgstr "cap�alera de signatura clara inv�lida\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:413
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla anidades\n"
 
-#: g10/armor.c:529
+#: g10/armor.c:537
 msgid "invalid dash escaped line: "
 msgstr "l�nia escapada amb gui� no v�lida: "
 
-#: g10/armor.c:541
+#: g10/armor.c:549
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:675 g10/armor.c:1242
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "car�cter radix64 %02x inv�lid om�s\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:718
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:752
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:756
 msgid "malformed CRC\n"
 msgstr "CRC mal format\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:760 g10/armor.c:1279
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:772
+#: g10/armor.c:780
 msgid "premature eof (in Trailer)\n"
 msgstr "f� de fitxer prematur (al final)\n"
 
-#: g10/armor.c:776
+#: g10/armor.c:784
 msgid "error in trailer line\n"
 msgstr "error en la �ltima l�nia\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Si voleu m�s informaci� vegeu http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1057
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1062
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: l�nia m�s llarga que %d car�cters\n"
 
-#: g10/armor.c:1059
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "car�cter �quoted printable� en l'armadura - probablement s'ha utilitzat un MTA amb errors\n"
-
-#. Translators: this shoud fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
-msgid "             Fingerprint:"
-msgstr "        Empremta digital:"
-
-#: g10/pkclist.c:80
-msgid "Fingerprint:"
-msgstr "Empremta digital:"
+#: g10/armor.c:1066
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"car�cter �quoted printable� en l'armadura - probablement s'ha utilitzat un "
+"MTA amb errors\n"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:61
 msgid "No reason specified"
 msgstr "No s'ha especificat cap ra�"
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:63
 msgid "Key is superseded"
 msgstr "La clau ha estat substitu�da"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:65
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:67
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:69
 msgid "User ID is no longer valid"
 msgstr "La ID d'usuari ja no �s v�lid"
 
-#: g10/pkclist.c:128
-msgid "Reason for revocation: "
+#: g10/pkclist.c:73
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Ra� de la revocaci�: "
 
-#: g10/pkclist.c:145
-msgid "Revocation comment: "
+#: g10/pkclist.c:90
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Comentari: "
 
 #. a string with valid answers
-#: g10/pkclist.c:303
-msgid "sSmMqQ"
-msgstr "sSmMqQ"
+#: g10/pkclist.c:252
+msgid "iImMqQsS"
+msgstr ""
 
-#: g10/pkclist.c:307
-#, c-format
+#: g10/pkclist.c:258
+#, fuzzy, c-format
 msgid ""
-"No trust value assigned to %lu:\n"
+"No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
 "No hi ha cap valor de confian�a assignat a %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:270
+#, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
 "checking fingerprints from different sources...)?\n"
 "\n"
-" 1 = Don't know\n"
-" 2 = I do NOT trust\n"
-" 3 = I trust marginally\n"
-" 4 = I trust fully\n"
-" s = please show me more information\n"
 msgstr ""
 "Fins a quin punt confieu en aquest usuari per a verificar\n"
 "les claus d'altres usuaris (mirant passaports,\n"
@@ -1051,86 +1221,92 @@ msgstr ""
 " 4 = Hi confie completament\n"
 " s = mostra m�s informaci�\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:273
+#, c-format
+msgid " %d = Don't know\n"
+msgstr ""
+
+#: g10/pkclist.c:274
+#, fuzzy, c-format
+msgid " %d = I do NOT trust\n"
+msgstr "%08lX: La clau no �s de confian�a\n"
+
+#: g10/pkclist.c:275
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr ""
+
+#: g10/pkclist.c:276
+#, fuzzy, c-format
+msgid " %d = I trust fully\n"
+msgstr "%s no �s un fitxer de base de dades de confian�a\n"
+
+#: g10/pkclist.c:278
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr ""
+
+#: g10/pkclist.c:279
+msgid " i = please show me more information\n"
+msgstr ""
+
+#: g10/pkclist.c:281
 msgid " m = back to the main menu\n"
 msgstr " m = torna al men� principal\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:284
+msgid " s = skip this key\n"
+msgstr ""
+
+#: g10/pkclist.c:285
 msgid " q = quit\n"
 msgstr " q = ix\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:292
 msgid "Your decision? "
 msgstr "La vostra decisi�? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:313
+#, fuzzy
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "Realment voleu eliminar aquesta clau? "
+
+#: g10/pkclist.c:325
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats que duen a una clau de confian�a absoluta:\n"
 
-#: g10/pkclist.c:429
-msgid ""
-"Could not find a valid trust path to the key.  Let's see whether we\n"
-"can assign some missing owner trust values.\n"
-"\n"
-msgstr ""
-"No s'ha trobat un cam� de confian�a v�lid a la clau. Vegem si podem\n"
-"assignar valors de confian�a no assignats.\n"
-"\n"
-
-#: g10/pkclist.c:435
-msgid ""
-"No path leading to one of our keys found.\n"
-"\n"
-msgstr ""
-"No s'ha trobat un cam� que condueixe a una de les nostres claus.\n"
-"\n"
-
-#: g10/pkclist.c:437
-msgid ""
-"No certificates with undefined trust found.\n"
-"\n"
-msgstr ""
-"No s'han trobat certificats amb confian�a no definida.\n"
-"\n"
-
-#: g10/pkclist.c:439
-msgid ""
-"No trust values changed.\n"
-"\n"
-msgstr ""
-"No s'ha canviat cap valor de confian�a.\n"
-"\n"
-
-#: g10/pkclist.c:457
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clau %08lX: aquesta clau ha estat revocada!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:406 g10/pkclist.c:418 g10/pkclist.c:512
 msgid "Use this key anyway? "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:411
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clau %08lX: aquesta subclau ha estat revocada!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:432
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la clau ha caducat\n"
 
-#: g10/pkclist.c:518
-#, c-format
-msgid "%08lX: no info to calculate a trust probability\n"
-msgstr "%08lX: no hi ha informaci� per a calcular una probabilitat de confian�a\n"
+#: g10/pkclist.c:442
+#, fuzzy, c-format
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:448
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: La clau no �s de confian�a\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:454
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1139,15 +1315,15 @@ msgstr ""
 "%08lX: No hi ha garanties que aquesta clau pertanga realment al seu\n"
 "propietari per� s'accepta de tota manera\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:460
 msgid "This key probably belongs to the owner\n"
 msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:465
 msgid "This key belongs to us\n"
 msgstr "Aquesta clau �s nostra\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:507
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1159,169 +1335,205 @@ msgstr ""
 "que s� a la seg�ent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:521 g10/pkclist.c:543
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ALERTA: �s una clau no fiable!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:562
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ALERTA: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:563
 msgid "         This could mean that the signature is forgery.\n"
 msgstr " A�� podria significar que la signatura �s falsificada.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:569
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ALERTA: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:574
+#, fuzzy
+msgid "Note: This key has been disabled.\n"
+msgstr "Aquesta clau ha estat desactivada"
+
+#: g10/pkclist.c:579
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:590
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ALERTA: Aquesta clau no ve certificada per una firma de confian�a!\n"
 
-#: g10/pkclist.c:689
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
+#: g10/pkclist.c:592
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:600
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ALERTA: La clau no �s de confian�a!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:601
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          Probablement la signatura �s falsa.\n"
 
-#: g10/pkclist.c:714
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:609
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "ALERTA: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "No �s segur que la signatura pertanga al seu propietari.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorat: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorat: clau p�blica ja present\n"
 
-#: g10/pkclist.c:853
-msgid ""
-"You did not specify a user ID. (you may use \"-r\")\n"
-"\n"
+#: g10/pkclist.c:803
+#, fuzzy
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat usuari. (Podeu usar �-r�)\n"
 
-#: g10/pkclist.c:863
-msgid "Enter the user ID: "
-msgstr "Introdu�u el nom d'usuari: "
+#: g10/pkclist.c:816
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorat: la clau p�blica ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "La clau p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:910
-msgid "skipped: public key already set with --encrypt-to\n"
-msgstr "ignorat: la clau p�blica ja s'ha especificat amb --encrypt-to\n"
+#: g10/pkclist.c:862
+#, fuzzy
+msgid "skipped: public key already set\n"
+msgstr "%s: ignorat: clau p�blica ja present\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatari predeterminat desconegut �%s�\n"
 
-#: g10/pkclist.c:974
-#, c-format
-msgid "%s: error checking key: %s\n"
-msgstr "%s: error en la comprovaci� de la clau: %s\n"
-
-#: g10/pkclist.c:979
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorat: la clau p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces v�lides\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:182
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:189
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "�%s� ignorat: duplicat\n"
+
+#: g10/keygen.c:194
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "llista les prefer�ncies"
+
+#: g10/keygen.c:264
+#, fuzzy
+msgid "invalid character in preference string\n"
+msgstr "Car�cter inv�lid en el camp *nom*\n"
+
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "escriptura de l'autosignatura\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "escriptura de l'autosignatura\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "escriptura de la signatura de comprovaci� de la clau\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "grand�ria de la clau inv�lida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "grand�ria de la clau arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Trieu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nom�s signar)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nom�s xifrar)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signar i xifrar)\n"
 
-#: g10/keygen.c:557
+#: g10/keygen.c:949
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (nom�s signar)\n"
+
+#: g10/keygen.c:951
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (nom�s xifrar)\n"
+
+#: g10/keygen.c:953
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signar i xifrar)\n"
 
-#: g10/keygen.c:561
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Trieu: "
 
-#: g10/keygen.c:572
-msgid "Do you really want to create a sign and encrypt key? "
-msgstr "Segur que voleu crear una clau de signatura i xifratge? "
-
-#: g10/keygen.c:580
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "L'us d'aquest algoritme est� desaconsellat - crear igualment? "
 
-#: g10/keygen.c:594
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Selecci� inv�lida.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1334,22 +1546,22 @@ msgstr ""
 "      grand�ria predeterminada: 1024 bits\n"
 "  grand�ria m�xima aconsellada: 2048 bits\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Quina grand�ria voleu? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA nom�s permet clau entre 512 i 1024 bits\n"
 
-#: g10/keygen.c:620
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "clau massa petita; 768 bits �s el m�nim perm�s.\n"
-
-#: g10/keygen.c:622
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "calu massa petita; 1024 bits �s el m�nim perm�s per a claus RSA.\n"
 
+#: g10/keygen.c:1030
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "clau massa petita; 768 bits �s el m�nim perm�s.\n"
+
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
 #. * to create such a key (but less than the time the Sirius
@@ -1358,12 +1570,12 @@ msgstr "calu massa petita; 1024 bits �s el m�nim perm�s per a claus RSA.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:633
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "clau massa llarga; %d �s el m�xim perm�s.\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1371,29 +1583,29 @@ msgstr ""
 "No es recomanen claus m�s llargues de 2048 bits perqu�\n"
 "els c�lculs s�n VERITABLEMENT llargs!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Segur que voleu aquesta grand�ria? "
 
-#: g10/keygen.c:642
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
-msgstr "D'acord, per� sapigueu que la radiaci� del monitor i del teclat tamb� son molt vulnerables als atacs!\n"
-
-#: g10/keygen.c:650
-msgid "Do you really need such a large keysize? "
-msgstr "Realment necessiteu una clau tan llarga? "
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"D'acord, per� sapigueu que la radiaci� del monitor i del teclat tamb� son "
+"molt vulnerables als atacs!\n"
 
-#: g10/keygen.c:656
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grand�ria sol�licitada �s %u bits\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1409,25 +1621,48 @@ msgstr ""
 "      <n>m = caduca als n mesos\n"
 "      <n>y = caduca als n anys\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:1126
+#, fuzzy
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"Especifiqueu el temps de validesa de la clau.\n"
+"         0 = no caduca\n"
+"      <n>  = caduca als n dies\n"
+"      <n>w = caduca a les n setmanes\n"
+"      <n>m = caduca als n mesos\n"
+"      <n>y = caduca als n anys\n"
+
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:1150
+#, fuzzy
+msgid "Signature is valid for? (0) "
+msgstr "Indiqueu la validesa de la clau (0) "
+
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valor inv�lid\n"
 
-#: g10/keygen.c:736
-msgid "Key does not expire at all\n"
+#: g10/keygen.c:1160
+#, fuzzy, c-format
+msgid "%s does not expire at all\n"
 msgstr "La clau no caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
-#, c-format
-msgid "Key expires at %s\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "%s expires at %s\n"
 msgstr "La clau caduca el %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1435,14 +1670,15 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les manejar� b� fins l'any 2106.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "�s correcte? (s/n)"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -1454,44 +1690,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nom i cognoms"
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Car�cter inv�lid en el camp *nom*\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot comen�ar amb un d�git\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1245
 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:825
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Adre�a electr�nica: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "No �s una adre�a v�lida\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Car�cter inv�lid en el camp *comentari*\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de car�cters `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1502,27 +1738,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1311
 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"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (Q) ix "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1327
 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 / (Q) ix"
 
-#: g10/keygen.c:918
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1530,11 +1766,17 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau privada.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
-msgid "passphrase not correctly repeated; try again.\n"
+#: g10/keyedit.c:784 g10/keygen.c:1393
+#, fuzzy
+msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1394
+#, c-format
+msgid "%s.\n"
+msgstr ""
+
+#: g10/keygen.c:1400
 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"
@@ -1546,7 +1788,7 @@ msgstr ""
 "useu aquest programa amb l'opci� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1421
 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"
@@ -1558,29 +1800,54 @@ msgstr ""
 "nombres primers; a�� d�na oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Generaci� de claus cancel�lada.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escriptura de la clau p�blica a `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escriptura de la clau privada a `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:2205
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
+
+#: g10/keygen.c:2211
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "clau %08lX: no s'ha trobat la clau privada: %s\n"
+
+#: g10/keygen.c:2225
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+
+#: g10/keygen.c:2232
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "claus p�blica i privada creades i signades.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:2253
+#, fuzzy
+msgid "key marked as ultimately trusted.\n"
+msgstr "Certificats que duen a una clau de confian�a absoluta:\n"
+
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1588,353 +1855,401 @@ 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:1701 g10/keygen.c:1810
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generaci� de claus ha fallat: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 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:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 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:1759
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no �s conformant amb OpenPGP\n"
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Crear realment? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454 g10/tdbio.c:515
+#: g10/decrypt.c:92 g10/encode.c:679
+msgid "--output doesn't work for this command\n"
+msgstr ""
+
+#: g10/encode.c:132 g10/encode.c:357
+#, fuzzy, c-format
+msgid "`%s' already compressed\n"
+msgstr "%lu claus processades\n"
+
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no s'ha pogut obrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creaci� de la contrasenya: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ALERTA: fitxer buit\n"
 
-#: g10/encode.c:274
+#: g10/encode.c:346
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr ""
+
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "llegint des de �%s�\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
+
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s xifrat per a: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: no s'ha trobat l'usuari: %s\n"
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "no s'ha trobat l'usuari �%s�: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "problema en la lectura del certificat: %s\n"
+#: g10/delkey.c:81 g10/export.c:213
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error en la lectura de �%s�: %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clau %08lX: no �s una clau rfc2440 - ignorada\n"
 
-#: g10/export.c:182
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clau %08lX: no protegida - ignorada\n"
 
-#: g10/export.c:236
+#: g10/export.c:246
+#, fuzzy, c-format
+msgid "key %08lX: PGP 2.x style key - skipped\n"
+msgstr "clau %08lX: clau nova: s'ignorar�\n"
+
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "ALERTA: no s'hi ha exportat res\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "massa entrades en la mem�ria cau de claus p�bliques - desactivada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[No s'ha trobat l'usuari]"
 
-#: g10/getkey.c:453
-msgid "too many entries in unk cache - disabled\n"
-msgstr "massa entrades en la mem�ria cau de claus desconegudes - desactivada\n"
+#: g10/getkey.c:1438
+#, c-format
+msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "s'usar� la clau secund�ria %08lX en lloc de la prim�ria %08lX\n"
 
-#: g10/getkey.c:2238 g10/trustdb.c:577
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau p�blica: ignorada\n"
 
-#: g10/import.c:184
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tipus %d ignorat\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:196
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de �%s�: %s\n"
 
-#: g10/import.c:206
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:208
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves ignorades: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "              sense ID: %lu\n"
 
-#: g10/import.c:213
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "            importades: %lu"
 
-#: g10/import.c:219
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        no modificades: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "    IDs d'usuaris nous: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        subclaus noves: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      signatures noves: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     noves revocacions: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "claus privades llegides: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:233
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "clau %08lX: enlla� de subclau inv�lid\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:422
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
+
+#: g10/import.c:663
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+msgstr "clau %08lX: s'ha acceptat la ID d'usuari no auto-signada '"
+
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no �s v�lid\n"
 
-#: g10/import.c:424
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "a�� pot ser causat per l'abs�ncia d'autofirma\n"
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clau %08lX: clau nova: s'ignorar�\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "no hi ha anell p�blic predeterminat\n"
+#: g10/import.c:697
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escriptura a �%s�\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "no s'ha pogut tancar l'anell �%s�: %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
 
-#: g10/import.c:463
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "clau %08lX: clau p�blica importada\n"
 
-#: g10/import.c:480
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra c�pia\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:495 g10/import.c:698
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:522
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: 1 ID d'usuari nou\n"
 
-#: g10/import.c:525
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: %d ID nous\n"
 
-#: g10/import.c:528
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: 1 signatura nova\n"
 
-#: g10/import.c:531
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: %d signatures noves\n"
 
-#: g10/import.c:534
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: 1 subclau nova\n"
 
-#: g10/import.c:537
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: %d subclaus noves\n"
 
-#: g10/import.c:547
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "clau %08lX: no modificada\n"
 
-#: g10/import.c:610
-#, c-format
-msgid "secret key %08lX not imported (use %s to allow for it)\n"
-msgstr "clau secreta %08lX no importada (utilitzeu %s per a permitir-ho)\n"
+#: g10/import.c:889
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "no hi ha anell p�blic predeterminat\n"
 
-#: g10/import.c:640
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clau %08lX: clau privada importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:644
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:649
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau privada: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clau %08lX: falta la clau p�blica: no es pot aplicar el certificat\n"
 "de revocaci�\n"
 
-#: g10/import.c:709
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: certificat de revocaci� inv�lid: %s: rebutjat\n"
 
-#: g10/import.c:741
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: certificat de revocaci� importat\n"
 
-#: g10/import.c:783
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:790 g10/import.c:814
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1060
+#, fuzzy, c-format
+msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "clau %08lX: algoritme de clau p�blica no suportat\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: invalid self-signature\n"
+#: g10/import.c:1062
+#, fuzzy, c-format
+msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "clau %08lX: autofirma no v�lida\n"
 
-#: g10/import.c:806
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
 
-#: g10/import.c:815
+#: g10/import.c:1089
 #, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "clau %08lX: enlla� de subclau inv�lid\n"
+msgid "key %08lX: unsupported public key algorithm\n"
+msgstr "clau %08lX: algoritme de clau p�blica no suportat\n"
 
-#: g10/import.c:842
+#: g10/import.c:1090
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '"
-msgstr "clau %08lX: s'ha acceptat la ID d'usuari no auto-signada '"
+msgid "key %08lX: invalid subkey binding\n"
+msgstr "clau %08lX: enlla� de subclau inv�lid\n"
 
-#: g10/import.c:871
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clau %08lX: ID ignorat '"
 
-#: g10/import.c:894
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clau %08lX: subclau ignorada\n"
@@ -1943,98 +2258,205 @@ msgstr "clau %08lX: subclau ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:919
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clau %08lX: signatura inexportable (classe %02x) - ignorada\n"
 
-#: g10/import.c:928
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "clau %08lX: certificat de revocaci� en el lloc equivocat - ignorat\n"
 
-#: g10/import.c:936
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: certificat de revocaci� no v�lid: %s - ignorat\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "clau %08lX: certificat de revocaci� en el lloc equivocat - ignorat\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: detectat ID duplicat - fusionat\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1365
 #, c-format
-msgid "key %08lX: revocation certificate added\n"
-msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci�\n"
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgstr ""
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1379
 #, c-format
-msgid "key %08lX: our copy has no self-signature\n"
-msgstr "clau %08lX: la nostra c�pia no t� auto-signatura\n"
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgstr ""
 
-#: g10/delkey.c:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: no s'ha trobat l'usuari\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
+msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci�\n"
 
-#: g10/keyedit.c:156
+#: g10/import.c:1467
+#, fuzzy, c-format
+msgid "key %08lX: direct key signature added\n"
+msgstr "clau %08lX: %d signatures noves\n"
+
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revocaci�]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 signatura err�nia\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures err�nies\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura v�lida\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n"
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:317
+#: g10/keyedit.c:357
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr ""
+
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Segur que voleu aquesta grand�ria? "
+
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
+msgid "  Unable to sign.\n"
+msgstr ""
+
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "ALERTA: �%s� �s un fitxer buit\n"
+
+#: g10/keyedit.c:396
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:405
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
+#. It's a local sig, and we want to make a
+#. exportable sig.
+#: g10/keyedit.c:419
 #, c-format
-msgid "Already signed by key %08lX\n"
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:423
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:443
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Ja est� signat amb la clau %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:447
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
+msgstr "Ja est� signat amb la clau %08lX\n"
+
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "No hi ha res que signat amb la clau %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:475
+#, fuzzy
+msgid "This key has expired!"
+msgstr "Nota: La clau ha caducat!\n"
+
+#: g10/keyedit.c:495
+#, fuzzy, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "Aquesta clau no est� protegida.\n"
+
+#: g10/keyedit.c:499
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr ""
+
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:534
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:557
+msgid ""
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
+"to the person named above?  If you don't know what to answer, enter \"0\".\n"
+msgstr ""
+
+#: g10/keyedit.c:561
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:563
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:565
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:567
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2042,41 +2464,94 @@ msgstr ""
 "Esteu segurs que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:601
+#, fuzzy
 msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "a�� pot ser causat per l'abs�ncia d'autofirma\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"La signatura es marcar� com a inexportable.\n"
+"\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"La signatura es marcar� com a inexportable.\n"
+"\n"
+
+#: g10/keyedit.c:617
+#, fuzzy
+msgid ""
+"\n"
 "The signature will be marked as non-exportable.\n"
+msgstr ""
+"La signatura es marcar� com a inexportable.\n"
+"\n"
+
+#: g10/keyedit.c:621
+#, fuzzy
+msgid ""
 "\n"
+"The signature will be marked as non-revocable.\n"
 msgstr ""
 "La signatura es marcar� com a inexportable.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:626
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+
+#: g10/keyedit.c:630
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+
+#: g10/keyedit.c:634
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el proc�s de signatura: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no est� protegida.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:745
 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:436
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "La clau est� protegida.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2084,7 +2559,7 @@ msgstr ""
 "Introdu�u la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2092,424 +2567,589 @@ msgstr ""
 "No voleu contrasenya: a�� �s probablement una *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "N'esteu segur de voler fer a��? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "eixit del men�"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "desa"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "ajuda"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "mostrar aquesta pantalla"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "llista"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "triar ID N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "clau"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "tria clau secund�ria N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "comprovar"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "llista signatures"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "signa la clau"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "signar la clau localment"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:913
+#, fuzzy
+msgid "nrsign"
+msgstr "sign"
+
+#: g10/keyedit.c:913
+#, fuzzy
+msgid "sign the key non-revocably"
+msgstr "signar la clau localment"
+
+#: g10/keyedit.c:914
+#, fuzzy
+msgid "nrlsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:914
+#, fuzzy
+msgid "sign the key locally and non-revocably"
+msgstr "signar la clau localment"
+
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "afegir ID d'usuari"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:917
+msgid "addphoto"
+msgstr ""
+
+#: g10/keyedit.c:917
+#, fuzzy
+msgid "add a photo ID"
+msgstr "afegir ID d'usuari"
+
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "esborrar ID d'usuari"
 
-#: g10/keyedit.c:599
+#. delphoto is really deluid in disguise
+#: g10/keyedit.c:920
+msgid "delphoto"
+msgstr ""
+
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "afegir una clau secund�ria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "esborrar una clau secund�ria"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "revocada"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "afegir una clau secund�ria"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "esborrar signatures"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "canviar la data de caducitat"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:926
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:926
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "canvia entre el llistat de claus secretes i p�bliques"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
-msgid "list preferences"
+#: g10/keyedit.c:930
+#, fuzzy
+msgid "list preferences (expert)"
 msgstr "llista les prefer�ncies"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:931
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "llista les prefer�ncies"
+
+#: g10/keyedit.c:932
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:932
+#, fuzzy
+msgid "set preference list"
+msgstr "llista les prefer�ncies"
+
+#: g10/keyedit.c:933
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:933
+#, fuzzy
+msgid "updated preferences"
+msgstr "llista les prefer�ncies"
+
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "canvia la confian�a"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revoca una clau secund�ria"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "desactivar clau"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "activa una clau"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/keyedit.c:940
+msgid "showphoto"
+msgstr ""
+
+#: g10/keyedit.c:940
+msgid "show photo ID"
+msgstr ""
+
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "no es pot fet aix� en mode batch\n"
 
-#. check that they match
-#. fixme: check that they both match
-#: g10/keyedit.c:671
+#: g10/keyedit.c:997
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "error en la lectura de �%s�: %s\n"
+
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "La clau secreta est� disponible.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Ordre>"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer a��.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre �toggle� abans.\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:1131
+#, fuzzy
+msgid "Key is revoked."
+msgstr "La clau est� protegida.\n"
+
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Signar tots els IDs? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els IDs que voleu signar\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
+#: g10/keyedit.c:1176
 #, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n"
+msgid "This command is not allowed while in %s mode.\n"
+msgstr ""
 
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'�ltim ID!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Eliminar tots els IDs seleccionats? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Eliminar aquest ID? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Realment voleu esborrar les claus seleccionades? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Eliminar tots els IDs seleccionats? "
+
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Crear els certificats de revocaci�? (y/N)"
+
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Desar els canvis? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Eixir sense desar? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualitzaci�: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
+msgstr "ALERTA: Aquesta clau ha estat revocada pel propietari!\n"
+
+#: g10/keyedit.c:1751
+msgid " (sensitive)"
+msgstr ""
+
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creada: %s expira: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subclau ha estat revocada: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- s'ha trobat una revocaci� falsa\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemes en la comprovaci� de la revocaci�: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1930
+msgid ""
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
+"         of PGP to reject this key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1935
+#, fuzzy
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Segur que voleu aquesta grand�ria? "
+
+#: g10/keyedit.c:1941
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Esborrar aquesta signatura correcta? (y/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Esborrar aquesta signatura inv�lida? (y/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Esborrar aquesta signatura desconeguda? (y/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Esborrar aquesta auto-signatura? (y/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signatura esborrada.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures esborrades.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Introdu�u la grand�ria de la clau"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Canviant la data de caducitat per a una clau secund�ria.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Canviant la data de caducitat per a una clau prim�ria.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:2475
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Heu de seleccionar al menys un ID.\n"
+
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr ""
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "ID d'usuari: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -2518,191 +3158,367 @@ msgstr ""
 "\"\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:1803
-msgid "Create a revocation certificate for this signature? (y/N)"
+#: g10/keyedit.c:2847
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"signat amb la vostra clau %08lX el %s\n"
+
+#: g10/keyedit.c:2852
+#, fuzzy, c-format
+msgid "This signature expired on %s.\n"
+msgstr "%s signatura de: %s\n"
+
+#: g10/keyedit.c:2856
+#, fuzzy
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Realment voleu revocar aquesta clau? "
+
+#: g10/keyedit.c:2860
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crear un certificat de revocaci� per a aquesta signatura? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Heu signat els seg�ents ID d'usuari:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2904
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "  signat per %08lX el %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "  revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
-#: g10/keyedit.c:1884
-msgid "Really create the revocation certificates? (y/N)"
+#: g10/keyedit.c:2942
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
+msgstr "  signat per %08lX el %s\n"
+
+#: g10/keyedit.c:2944
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2951
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N) "
 msgstr "Crear els certificats de revocaci�? (y/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
+#: g10/keyedit.c:3133
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "escriptura de l'autosignatura\n"
+
+#: g10/keylist.c:93
+#, fuzzy
+msgid "Signature policy: "
+msgstr "%s signatura de: %s\n"
+
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
+msgid "WARNING: invalid notation data found\n"
+msgstr "ALERTA: s'hi ha trobat dades de notaci� inv�lides\n"
+
+#: g10/keylist.c:127
+msgid "Critical signature notation: "
+msgstr ""
+
+#: g10/keylist.c:129
+#, fuzzy
+msgid "Signature notation: "
+msgstr "Notaci�: "
+
+#: g10/keylist.c:136
+msgid "not human readable"
+msgstr ""
+
+#: g10/keylist.c:225
+msgid "Keyring"
+msgstr ""
+
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr "[caduca: %s]"
 
-#: g10/mainproc.c:269
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "llista claus i empremtes dactilars"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "        Empremta digital:"
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "llista claus i empremtes dactilars"
+
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "        Empremta digital:"
+
+#: g10/keylist.c:1010
+#, fuzzy
+msgid "     Key fingerprint ="
+msgstr "        Empremta digital:"
+
+#: g10/encr-data.c:66 g10/mainproc.c:282
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "dades xifrades amb %s\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:284
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "xifrat amb l'algoritme %d (desconegut)\n"
+
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clau p�blica �s %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau p�blica: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau p�blica: %s\n"
 
-#: g10/mainproc.c:430
+#: g10/mainproc.c:461 g10/mainproc.c:480
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "dades xifrades amb %s\n"
+
+#: g10/mainproc.c:468
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr ""
+
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ALERTA: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol�licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci� aut�noma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
-msgid "WARNING: invalid notation data found\n"
-msgstr "ALERTA: s'hi ha trobat dades de notaci� inv�lides\n"
-
-#: g10/mainproc.c:731
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notaci�: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "verificaci� de signatura eliminada\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "no es poden manejar aquestes signatures m�ltiples\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signatura creada %.*s usant una clau %s ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
+#, fuzzy
+msgid "Expired signature from \""
+msgstr "Signatura correcta de \""
+
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1391
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "no �s una signatura separada\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura aut�noma de classe 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet arrel inv�lid detectat en proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:101
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els *core dump*: %s\n"
 
-#: g10/misc.c:208
+#: g10/misc.c:211
 msgid "Experimental algorithms should not be used!\n"
 msgstr "No haur�eu d'usar algoritmes experimentals!\n"
 
-#: g10/misc.c:238
+#: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "aquest algoritme de xifrat est� desaconsellat; useu-ne un de m�s est�ndard!\n"
+msgstr ""
+"aquest algoritme de xifrat est� desaconsellat; useu-ne un de m�s est�ndard!\n"
+
+#: g10/misc.c:386
+#, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgstr ""
+
+#: g10/misc.c:418
+#, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+msgstr ""
+
+#: g10/misc.c:443
+msgid "the IDEA cipher plugin is not present\n"
+msgstr ""
+
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s: no s'ha pogut obrir: %s\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ALERTA: �%s� �s un fitxer buit\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no s'ha pogut manejar l'algoritme de clau p�blica %d\n"
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
 
-#: g10/passphrase.c:223
+#: g10/passphrase.c:442 g10/passphrase.c:489
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no est� disponible en aquesta sessi�\n"
 
-#: g10/passphrase.c:229
+#: g10/passphrase.c:450
+msgid "can't set client pid for the agent\n"
+msgstr ""
+
+#: g10/passphrase.c:458
+msgid "can't get server read FD for the agent\n"
+msgstr ""
+
+#: g10/passphrase.c:465
+msgid "can't get server write FD for the agent\n"
+msgstr ""
+
+#: g10/passphrase.c:498
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable d'entorn GPG_AGENT_INFO mal formada\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/passphrase.c:511
+#, fuzzy, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "l'algoritme de protecci� %d no est� suportat\n"
+
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb �%s�: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:554
+msgid "communication problem with gpg-agent\n"
+msgstr ""
+
+#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#, fuzzy
+msgid "problem with the agent - disabling agent use\n"
+msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
+
+#: g10/passphrase.c:631 g10/passphrase.c:1017
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID de la clau principal %08lX)"
@@ -2715,7 +3531,7 @@ msgstr " (ID de la clau principal %08lX)"
 # "�%1$.*s�\n"
 # "clau %3$s de %2$u bits, ID %4$08lX, creada en %5$s%6$s\n"
 # jm
-#: g10/passphrase.c:323
+#: g10/passphrase.c:641
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2726,32 +3542,32 @@ msgstr ""
 "�%.*s�\n"
 "clau de %u bits, %s, ID %08lX, creada en %s%s\n"
 
-#: g10/passphrase.c:344
+#: g10/passphrase.c:662
 msgid "Enter passphrase\n"
 msgstr "Introdu�u contrasenya\n"
 
-#: g10/passphrase.c:346
+#: g10/passphrase.c:664
 msgid "Repeat passphrase\n"
 msgstr "Repetiu contrasenya\n"
 
-#: g10/passphrase.c:384
+#: g10/passphrase.c:705
 msgid "passphrase too long\n"
 msgstr "contrasenya massa llarga\n"
 
-#: g10/passphrase.c:396
+#: g10/passphrase.c:718
 msgid "invalid response from agent\n"
 msgstr "resposta inv�lida del agent\n"
 
-#: g10/passphrase.c:405
+#: g10/passphrase.c:727 g10/passphrase.c:808
 msgid "cancelled by user\n"
 msgstr "cancel�lat per l'usuari\n"
 
-#: g10/passphrase.c:408 g10/passphrase.c:481
+#: g10/passphrase.c:729 g10/passphrase.c:890
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:1003
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2761,20 +3577,20 @@ msgstr ""
 "Necessiteu la contrasenya per desbloquejar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:1012
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:1063
 msgid "can't query password in batchmode\n"
 msgstr "no es pot demanar la contrasenya en mode batch\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:1067
 msgid "Enter passphrase: "
 msgstr "Introdu�u contrasenya: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:1071
 msgid "Repeat passphrase: "
 msgstr "Repetiu contrasenya: "
 
@@ -2782,156 +3598,210 @@ msgstr "Repetiu contrasenya: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "les dades no s'han desat; useu l'opci� \"--output\" per desar-les\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "error en la lectura de �%s�: %s\n"
+
+#: g10/plaintext.c:337
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:341
 msgid "Please enter name of data file: "
 msgstr "Introdu�u el nom del fitxer de dades: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:362
 msgid "reading stdin ...\n"
 msgstr "llegint stdin...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:396
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:404
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
-#: g10/pubkey-enc.c:76
-#, c-format
-msgid "anonymous receiver; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:101
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatari an�nim; es provar� la clau secreta %08lX...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'acord, som el destinatari an�nim.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificaci� antiga del DEK no est� suportada\n"
 
-#: g10/pubkey-enc.c:153
-#, c-format
-msgid "cipher algorithm %d is unknown or disabled\n"
+#: g10/pubkey-enc.c:178
+#, fuzzy, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritme de xifratge %d �s desconegut o est� desactivat\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
 
-#: g10/pubkey-enc.c:198
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/hkp.c:59
-#, c-format
-msgid "requesting key %08lX from %s ...\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "clau %08lX: aquesta clau ha estat revocada!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "sol�licitud de la clau %08lX de %s...\n"
 
-#: g10/hkp.c:83
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "no s'ha pogut obtenir del servidor la clau: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
-msgid "no keyserver known (use option --keyserver)\n"
-msgstr "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n"
-
-#: g10/hkp.c:110
-#, c-format
-msgid "%s: not a valid key ID\n"
-msgstr "%s: no �s un ID v�lid\n"
-
-#: g10/hkp.c:191
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error mentre s'enviava a `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "l'enviament a `%s' ha tingut �xit (status=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'enviament a `%s' ha fallat: status=%u\n"
 
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
+#, c-format
+msgid "searching for \"%s\" from HKP server %s\n"
+msgstr ""
+
+#: g10/hkp.c:547
+#, fuzzy, c-format
+msgid "can't search keyserver: %s\n"
+msgstr "no s'ha pogut obtenir del servidor la clau: %s\n"
+
 #: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
 #: g10/seckey-cert.c:59
-#, c-format
-msgid "protection algorithm %d is not supported\n"
+#, fuzzy, c-format
+msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritme de protecci� %d no est� suportat\n"
 
-#: g10/seckey-cert.c:184
-msgid "Invalid passphrase; please try again ...\n"
+#: g10/seckey-cert.c:215
+#, fuzzy
+msgid "Invalid passphrase; please try again"
 msgstr "La contrasenya no �s v�lida; torneu a intentar-ho...\n"
 
-#: g10/seckey-cert.c:240
+#: g10/seckey-cert.c:216
+#, c-format
+msgid "%s ...\n"
+msgstr ""
+
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ALERTA: la clau �s feble; per favor, canvieu la contrasenya.\n"
 
-#: g10/sig-check.c:199
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "es suposa MDC erroni a causa d'un bit cr�tic desconegut\n"
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
 
-#: g10/sig-check.c:297
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
-msgstr "esta �s una clau ElGamal generada per PGP que NO �s segura per a signatures!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"esta �s una clau ElGamal generada per PGP que NO �s segura per a "
+"signatures!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clau p�blica �s %lu segons posterior a la signatura\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clau p�blica �s %lu segons posterior a la signatura\n"
 
-#: g10/sig-check.c:328
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
-msgstr "es supossa una signatura incorr�cta a causa d'un bit cr�tic desconegut\n"
+msgstr ""
+"es supossa una signatura incorr�cta a causa d'un bit cr�tic desconegut\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:103
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:151
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "No s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signatura de: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:461
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ALERTA: �%s� �s un fitxer buit\n"
+
+#: g10/sign.c:644
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ALERTA: �%s� �s un fitxer buit\n"
+#: g10/sign.c:876
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/sign.c:1029
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "ha fallat el desxifratge: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2943,419 +3813,209 @@ msgstr "no es poden manejar l�nies m�s llargues de %d car�cters\n"
 msgid "input line longer than %d characters\n"
 msgstr "la l�nia d'entrada �s superior a %d car�cters\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, 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:122 g10/tdbio.c:1630
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "reg de la base de dades de confian�a %lu: ha fallat la escriptura (n=%d): %s\n"
+msgstr ""
+"reg de la base de dades de confian�a %lu: ha fallat la escriptura (n=%d): %"
+"s\n"
 
-#: g10/tdbio.c:232
+#: g10/tdbio.c:237
 msgid "trustdb transaction too large\n"
 msgstr "transacci� de la base de dades de confian�a massa gran\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:454
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: no s'ha pogut accedir: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:468
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: no s'ha pogut crear: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:478 g10/tdbio.c:498 g10/tdbio.c:541
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: no s'ha pogut crear el bloqueig\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:480 g10/tdbio.c:544
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: no s'ha pogut crear el bloqueig\n"
+
+#: g10/keyring.c:1436 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:484
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: no s'ha pogut crear: %s\n"
+
+#: g10/tdbio.c:503
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versi�: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:507
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: s'ha creat una base de dades de confian�a inv�lida\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confian�a\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dades de confian�a inv�lida\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:597
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula hash: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:605
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error al actualitzar el registre de la versi�: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665 g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error al llegir el registre de la versi�: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error al escriure el registre de la versi�: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confian�a: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1127
 #, 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:1264
+#: g10/tdbio.c:1148
 #, 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:1280
+#: g10/tdbio.c:1165
 #, 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:1285
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi� de fitxer %d inv�lid\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error al llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error al escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1366
 #, 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:1637
+#: g10/tdbio.c:1396
 #, 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:1748
+#: g10/tdbio.c:1441
 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-trustdb�.\n"
-
-#: g10/trustdb.c:169
-#, c-format
-msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut llegir: %s\n"
-
-#: g10/trustdb.c:184
-#, c-format
-msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n"
-
-#: g10/trustdb.c:198
-#, c-format
-msgid "trust record %lu: delete failed: %s\n"
-msgstr "registre de confian�a %lu: no s'ha pogut eliminar: %s\n"
-
-#: g10/trustdb.c:212
-#, c-format
-msgid "trustdb: sync failed: %s\n"
-msgstr "base de dades de confian�a: no s'ha pogut sincronitzar: %s\n"
-
-#: g10/trustdb.c:377
-#, c-format
-msgid "error reading dir record for LID %lu: %s\n"
-msgstr "error al llegir el registre de directori per al LID %lu: %s\n"
-
-#: g10/trustdb.c:384
-#, c-format
-msgid "lid %lu: expected dir record, got type %d\n"
-msgstr "lid %lu: s'esperava registre de directori, s'ha obtingut %d\n"
-
-#: g10/trustdb.c:389
-#, c-format
-msgid "no primary key for LID %lu\n"
-msgstr "no hi ha una clau prim�ria per al LID %lu\n"
-
-#: g10/trustdb.c:394
-#, c-format
-msgid "error reading primary key for LID %lu: %s\n"
-msgstr "error al llegir clau prim�ria per al LID %lu: %s\n"
-
-#: g10/trustdb.c:433
-#, c-format
-msgid "get_dir_record: search_record failed: %s\n"
-msgstr "get_dir_record: ha fallat search_record: %s\n"
+msgstr ""
+"la base de dades de confian�a est� corrompuda; per favor, executeu �gpg --"
+"fix-trustdb�.\n"
 
-#: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#: g10/trustdb.c:200
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "�%s� no �s un ID de clau llarg v�lid\n"
 
-#: g10/trustdb.c:501
-#, c-format
-msgid "key %08lX: can't put it into the trustdb\n"
-msgstr "clau %08lX: no es pot introduir en la base de dades de confian�a\n"
-
-#: g10/trustdb.c:507
-#, c-format
-msgid "key %08lX: query record failed\n"
-msgstr "clau %08lX: la consulta del registre ha fallat\n"
-
-#: g10/trustdb.c:516
-#, c-format
-msgid "key %08lX: already in trusted key table\n"
-msgstr "clau %08lX: ja es troba en la taula de claus de confian�a\n"
-
-#: g10/trustdb.c:519
-#, c-format
-msgid "key %08lX: accepted as trusted key.\n"
+#: g10/trustdb.c:235
+#, fuzzy, c-format
+msgid "key %08lX: accepted as trusted key\n"
 msgstr "clau %08lX: acceptada com a clau fiable.\n"
 
-#: g10/trustdb.c:546
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "clau %08lX: no hi ha una clau p�blica per a la clau fiable - ignorada\n"
-
-#: g10/trustdb.c:565
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTE: la clau secreta %08lX no est� protegida.\n"
-
-#: g10/trustdb.c:584
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "clau %08lX: les claus p�blica i secreta no coincideixen\n"
-
-#: g10/trustdb.c:597
-#, c-format
-msgid "enumerate secret keys failed: %s\n"
-msgstr "no s'ha pogut enumerar les claus secretes: %s\n"
-
-#: g10/trustdb.c:987
-#, c-format
-msgid "key %08lX.%lu: Good subkey binding\n"
-msgstr "clau %08lX.%lu: Enlla� de subclau correcta\n"
-
-#: g10/trustdb.c:993 g10/trustdb.c:1028
-#, c-format
-msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-msgstr "clau %08lX.%lu: Enlla� de subclau inv�lid: %s\n"
-
-#: g10/trustdb.c:1005
-#, c-format
-msgid "key %08lX.%lu: Valid key revocation\n"
-msgstr "clau %08lX.%lu: Revocaci� de clau v�lida\n"
-
-#: g10/trustdb.c:1011
-#, c-format
-msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-msgstr "clau %08lX.%lu: Revocaci� de clau inv�lida: %s\n"
-
-#: g10/trustdb.c:1022
-#, c-format
-msgid "key %08lX.%lu: Valid subkey revocation\n"
-msgstr "clau %08lX.%lu: Subclau de revocaci� v�lida\n"
-
-#: g10/trustdb.c:1133
-msgid "Good self-signature"
-msgstr "Auto-signatura correcta"
-
-#: g10/trustdb.c:1143
-msgid "Invalid self-signature"
-msgstr "Auto-signatura inv�lida"
-
-#: g10/trustdb.c:1170
-msgid "Valid user ID revocation skipped due to a newer self signature"
-msgstr "Revocaci� d'ID d'usuari v�lida ignorada degut a una auto-signatura m�s recent"
-
-#: g10/trustdb.c:1176
-msgid "Valid user ID revocation"
-msgstr "Revocaci� d'ID d'usuari v�lida"
-
-#: g10/trustdb.c:1181
-msgid "Invalid user ID revocation"
-msgstr "Revocaci� d'ID d'usuari inv�lida"
-
-#: g10/trustdb.c:1223
-msgid "Valid certificate revocation"
-msgstr "Certificat de revocaci� v�lid"
-
-#: g10/trustdb.c:1224
-msgid "Good certificate"
-msgstr "Certificat correcte"
-
-#: g10/trustdb.c:1252
-msgid "Invalid certificate revocation"
-msgstr "Certificat de revocaci� inv�lid"
-
-#: g10/trustdb.c:1253
-msgid "Invalid certificate"
-msgstr "Certificat inv�lid"
-
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
-#, c-format
-msgid "sig record %lu[%d] points to wrong record.\n"
-msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n"
-
-#: g10/trustdb.c:1333
-msgid "duplicated certificate - deleted"
-msgstr "certificat duplicat: esborrat"
-
-#: g10/trustdb.c:1650
-#, c-format
-msgid "tdbio_search_dir failed: %s\n"
-msgstr "tdbio_search_dir ha fallat: %s\n"
-
-#: g10/trustdb.c:1784
-#, c-format
-msgid "lid ?: insert failed: %s\n"
-msgstr "lid ?: la inserci� ha fallat: %s\n"
-
-#: g10/trustdb.c:1789
-#, c-format
-msgid "lid %lu: insert failed: %s\n"
-msgstr "lid %lu: la inserci� ha fallat: %s\n"
-
-#: g10/trustdb.c:1795
-#, c-format
-msgid "lid %lu: inserted\n"
-msgstr "lid %lu: inserit\n"
-
-#: g10/trustdb.c:1800
-#, c-format
-msgid "error reading dir record: %s\n"
-msgstr "error al llegir el registre de directori: %s\n"
-
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
-#, c-format
-msgid "%lu keys processed\n"
-msgstr "%lu claus processades\n"
-
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
-#, c-format
-msgid "\t%lu keys with errors\n"
-msgstr "\t%lu claus amb errors\n"
+#: g10/trustdb.c:274
+#, fuzzy, c-format
+msgid "key %08lX occurs more than once in the trustdb\n"
+msgstr "clau %08lX: no es pot introduir en la base de dades de confian�a\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:290
 #, c-format
-msgid "\t%lu keys inserted\n"
-msgstr "\t%lu claus inserides\n"
-
-# fuzzy... jm
-# (esborra aquest comentari i tal)
-#: g10/trustdb.c:1815
-#, c-format
-msgid "enumerate keyblocks failed: %s\n"
-msgstr "no s'ha pogut enumerar els blocs de claus: %s\n"
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr ""
+"clau %08lX: no hi ha una clau p�blica per a la clau fiable - ignorada\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:332
 #, c-format
-msgid "lid %lu: dir record w/o key - skipped\n"
-msgstr "lid %lu: registre de directori sense clau - ignorat\n"
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:1873
-#, c-format
-msgid "\t%lu due to new pubkeys\n"
-msgstr "\\t%lu degut a noves claus p�bliques\n"
+#: g10/trustdb.c:338
+#, fuzzy, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "registre de confian�a %lu: no s'ha pogut eliminar: %s\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:353
 #, c-format
-msgid "\t%lu keys skipped\n"
-msgstr "\t%lu claus ignorades\n"
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:368
 #, c-format
-msgid "\t%lu keys updated\n"
-msgstr "\t%lu clau actualitzades\n"
-
-#: g10/trustdb.c:2224
-msgid "Ooops, no keys\n"
-msgstr "Ooops, no hi ha claus\n"
+msgid "trustdb: sync failed: %s\n"
+msgstr "base de dades de confian�a: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/trustdb.c:2228
-msgid "Ooops, no user IDs\n"
-msgstr "Ooops, no hi ha IDs\n"
+#: g10/trustdb.c:468
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s no �s un fitxer de base de dades de confian�a\n"
 
-#: g10/trustdb.c:2386
-#, c-format
-msgid "check_trust: search dir record failed: %s\n"
-msgstr "check_trust: ha fallat la cerca en el registre de directori: %s\n"
+#: g10/trustdb.c:474 g10/trustdb.c:1641
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "reg de la base de dades de confian�a %lu: ha fallat lseek: %s\n"
 
-#: g10/trustdb.c:2395
-#, c-format
-msgid "key %08lX: insert trust record failed: %s\n"
-msgstr "clau %08lX: ha fallat la inserci� en la base de dades de confian�a: %s\n"
+#: g10/trustdb.c:779
+#, fuzzy
+msgid "checking the trustdb\n"
+msgstr "canvia la confian�a"
 
-#: g10/trustdb.c:2399
-#, c-format
-msgid "key %08lX.%lu: inserted into trustdb\n"
-msgstr "clau %08lX.%lu: inserida en la base de dades de confian�a\n"
+#: g10/trustdb.c:933
+#, fuzzy, c-format
+msgid "public key %08lX not found: %s\n"
+msgstr "no s'ha trobat la clau p�blica"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:1515
 #, c-format
-msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
-"clau %08lX.%lu: creada en el futur (salt en el temps o problema de\n"
-"rellotge)\n"
-
-#: g10/trustdb.c:2422
-#, c-format
-msgid "key %08lX.%lu: expired at %s\n"
-msgstr "clau %08lX.%lu: caducada el %s\n"
-
-#: g10/trustdb.c:2430
-#, c-format
-msgid "key %08lX.%lu: trust check failed: %s\n"
-msgstr "clau %08lX.%lu: ha fallat la verificaci� de confian�a: %s\n"
-
-#: g10/trustdb.c:2581
-#, c-format
-msgid "user '%s' not found: %s\n"
-msgstr "no s'ha trobat l'usuari �%s�: %s\n"
-
-#: g10/trustdb.c:2583
-#, c-format
-msgid "problem finding '%s' in trustdb: %s\n"
-msgstr "problema al cercar �%s� en la base de dades de confian�a: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:1593
 #, c-format
-msgid "user '%s' not in trustdb - inserting\n"
-msgstr "l'usuari �%s� no est� en la base de dades de confian�a - inserint-lo\n"
-
-#: g10/trustdb.c:2589
-#, c-format
-msgid "failed to put '%s' into trustdb: %s\n"
-msgstr "no s'ha pogut posar �%s� en la base de dades de confian�a - %s\n"
-
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "AV�S: encara no es poden manejar registres de pref�ncies llargs\n"
+msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
 
 #: g10/verify.c:108
 msgid ""
@@ -3372,56 +4032,34 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "l�nia d'entrada %u massa llarga o hi falta LF\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: no s'ha creat l'anell: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: anell creat\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "ALERTA: hi ha 2 fitxers amb informaci� confidencial.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s �s el que no ha canviat\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s �s el nou\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
-
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA fals!\n"
+msgstr ""
+"la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA "
+"fals!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "�%s� ignorat: duplicat\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "�%s� ignorat: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "ignorat: clau secreta ja present\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
-msgstr "Ignorada �%s�: �s una clau ElGamal generada per PGP que no �s segura per a signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"Ignorada �%s�: �s una clau ElGamal generada per PGP que no �s segura per a "
+"signatures!\n"
 
 #. do not overwrite
 #: g10/openfile.c:84
@@ -3468,25 +4106,17 @@ msgstr "%s: directori creat\n"
 
 #: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "heu d'executar GnuPG de nou perqu� puga llegir el nou fitxer d'opcions\n"
-
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "dades xifrades amb %s\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "xifrat amb l'algoritme %d (desconegut)\n"
+msgstr ""
+"heu d'executar GnuPG de nou perqu� puga llegir el nou fitxer d'opcions\n"
 
-#: g10/encr-data.c:90
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCI�: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
 "sim�tric.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "problema al manejar un paquet xifrat\n"
 
@@ -3501,24 +4131,45 @@ msgstr ""
 "no s'ha pogut evitar una clau feble per a xifratge sim�tric;\n"
 "hi ha hagut %d intents!\n"
 
-#: g10/delkey.c:114
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "no es pot fer aix� en el mode per lots sense �--yes�\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Esborrar aquesta clau de l'anell? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "�s una clau secreta! Voleu esborrar-la? "
 
-#: g10/delkey.c:181
-msgid "there is a secret key for this public key!\n"
+# fuzzy... jm
+# (esborra aquest comentari i tal)
+#: g10/delkey.c:168
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "no s'ha pogut enumerar els blocs de claus: %s\n"
+
+#: g10/delkey.c:178
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:206
+#, fuzzy, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "hi ha una clau secreta per a aquesta clau p�blica!\n"
 
-#: g10/delkey.c:183
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
+#: g10/delkey.c:208
+#, fuzzy
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opci� �--delete-secret-key� per a eliminar-la primer.\n"
 
 #: g10/helptext.c:47
@@ -3532,19 +4183,29 @@ msgstr ""
 "res a veure amb la xarxa de certificats (creada impl�citament)."
 
 #: g10/helptext.c:53
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+
+#: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Si voleu utilitzar aquesta clau revocada de totes maneres, dieu �s��."
 
 # fuzzy, "clau no confiable"? jm
-#: g10/helptext.c:57
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Si voleu utilitzar aquesta clau no confiable de totes maneres, dieu �s��."
+msgstr ""
+"Si voleu utilitzar aquesta clau no confiable de totes maneres, dieu �s��."
 
-#: g10/helptext.c:61
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+#: g10/helptext.c:68
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introdu�u l'ID d'usuari de la persona a qui voleu enviar el missatge."
 
-#: g10/helptext.c:65
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -3553,7 +4214,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -3570,17 +4232,19 @@ msgstr ""
 "la comprovaci� de signatures DSA �s molt m�s r�pida que les de ElGamal.\n"
 "\n"
 "ElGamal �s un algoritme que es pot utilitzar per a signatures i xifrat.\n"
-"OpenPGP distingueix entre 2 variants d'aquest algoritme: una de nom�s xifrat\n"
+"OpenPGP distingueix entre 2 variants d'aquest algoritme: una de nom�s "
+"xifrat\n"
 "i una de signatura+xifrat; en veritat �s el mateix, per� alguns par�mentres\n"
 "han de seleccionar-se d'una manera especial per a crear claus m�s segures\n"
 "per a signatures: aquest programa fa a��, per� altres implementacions\n"
 "d'OpenPGP no estan obligades a entendre la variant signatura+xifrat.\n"
 "\n"
-"La primera clau (prim�ria) ha de ser sempre una clau que siga capa� de signar;\n"
+"La primera clau (prim�ria) ha de ser sempre una clau que siga capa� de "
+"signar;\n"
 "aquesta �s la ra� per la que la clau de nom�s encriptaci� ElGamal no est�\n"
 "disponible en aquest men�."
 
-#: g10/helptext.c:85
+#: g10/helptext.c:92
 msgid ""
 "Although these keys are defined in RFC2440 they are not suggested\n"
 "because they are not supported by all programs and signatures created\n"
@@ -3590,15 +4254,23 @@ msgstr ""
 "Perqu� no tots els programes hi poden treballar i perqu� les\n"
 "signatures que generen s�n molt llargues i lentes de verificar."
 
-#: g10/helptext.c:92
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Introdu�u la grand�ria de la clau"
 
-#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Contesteu �s�� o �no�"
 
-#: g10/helptext.c:106
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -3610,19 +4282,19 @@ msgstr ""
 "una bona resposta d'error - en canvi, el sistema tractar� d'interpretar\n"
 "el valor donat com un interval."
 
-#: g10/helptext.c:118
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Introdu�u el nom del propietari de la clau"
 
-#: g10/helptext.c:123
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "introdu�u una adre�a de correu (opcional per� molt recomanable)"
 
-#: g10/helptext.c:127
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Introdu�u un comentari opcional"
 
-#: g10/helptext.c:132
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -3636,15 +4308,56 @@ msgstr ""
 "O  continua la generaci� de les claus.\n"
 "Q  ix."
 
-#: g10/helptext.c:141
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Contesteu �s�� (o nom�s �s�) si �s correcte generar la subclau."
 
-#: g10/helptext.c:164
+#: g10/helptext.c:162
+msgid ""
+"When you sign a user ID on a key, you should first verify that the key\n"
+"belongs to the person named in the user ID.  It is useful for others to\n"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Contesteu �s�� si voleu signar TOTS els ID d'usuari"
 
-#: g10/helptext.c:168
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -3652,11 +4365,11 @@ msgstr ""
 "Contesteu �s�� si realment voleu eliminar aquest ID d'usuari.\n"
 "Tots els certificats tamb� es perdran!"
 
-#: g10/helptext.c:173
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Contesteu �s�� si �s correcte eliminar la subclau"
 
-#: g10/helptext.c:178
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -3667,7 +4380,7 @@ msgstr ""
 "una connexi� de confian�a a la clau o a un altra clau certificada\n"
 "per aquesta clau."
 
-#: g10/helptext.c:183
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -3680,7 +4393,7 @@ msgstr ""
 "podria establir una connexi� de confian�a a trav�s d'una altra clau ja\n"
 "certificada."
 
-#: g10/helptext.c:189
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -3688,7 +4401,7 @@ msgstr ""
 "La signatura no �s v�lida. T� sentit que l'elimineu de l'anell\n"
 "de claus."
 
-#: g10/helptext.c:193
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -3702,27 +4415,33 @@ msgstr ""
 "que feu a�� nom�s si la auto-signatura no �s v�lida per alguna ra� i\n"
 "hi ha una segona disponible."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:237
 msgid ""
-"Please enter the passhrase; this is a secret sentence \n"
-"  Blurb, blurb,.... "
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures will be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:244
+#, fuzzy
+msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "Introdu�u la contrasenya; aquesta ha de ser una frase secreta \n"
 "  Blurb, blurb..."
 
-#: g10/helptext.c:209
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Per favor, repetiu l'�ltima contrasenya per confirmar-la."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Doneu el nom del fitxer al que s'aplica la signatura"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Contesteu �s�� si �s correcte sobreescriure el fitxer"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3730,7 +4449,7 @@ msgstr ""
 "Introdu�u un nom de fitxer. Si premeu RETURN s'hi usar� el fitxer\n"
 "predeterminat (apareix entre claud�tors)."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3759,7 +4478,7 @@ msgstr ""
 "      d'utilitzar m�s; a�� s'utilitza normalment per a marcar una adre�a\n"
 "      de correu com inv�lida.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3769,15 +4488,344 @@ msgstr ""
 "certificat de revocaci�. Per favor, sigueu concisos.\n"
 "Una l�nia buida indica el final del text.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "No hi ha ajuda disponible"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
+#: g10/keydb.c:177
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+
+#: g10/keydb.c:188
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:197
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: anell creat\n"
+
+#: g10/keydb.c:587
+#, fuzzy, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "%s: no s'ha pogut crear la taula hash: %s\n"
+
+#: g10/keyring.c:1235
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "ALERTA: hi ha 2 fitxers amb informaci� confidencial.\n"
+
+#: g10/keyring.c:1237
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s �s el que no ha canviat\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s �s el nou\n"
+
+#: g10/keyring.c:1239
+msgid "Please fix this possible security flaw\n"
+msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
+
+#: g10/keyring.c:1337
+#, fuzzy, c-format
+msgid "checking keyring `%s'\n"
+msgstr "no s'ha pogut tancar l'anell �%s�: %s\n"
+
+#: g10/keyring.c:1368
+#, fuzzy, c-format
+msgid "%lu keys so far checked (%lu signatures)\n"
+msgstr "fins ara s'han processat %lu claus\n"
+
+#: g10/keyring.c:1379
+#, fuzzy, c-format
+msgid "%lu keys checked (%lu signatures)\n"
+msgstr "llista claus i signatures"
+
+#: g10/keyring.c:1441
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: anell creat\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "massa bits aleatoris sol�licitats; el l�mit �s %d\n"
+
+#~ msgid "|[NAMES]|check the trust database"
+#~ msgstr "|[NOMS]|comprova la base de dades de confian�a"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOM=VALOR|usa aquesta notaci� de dades"
+
+#~ msgid "--delete-secret-key user-id"
+#~ msgstr "--delete-secret-key user-id"
+
+#~ msgid "--delete-key user-id"
+#~ msgstr "--delete-key user-id"
+
+#~ msgid "--delete-secret-and-public-key user-id"
+#~ msgstr "--delete-secret-and-public-key user-id"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "el primer car�cter de la notaci� ha de ser una lletra o un subratllat\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "els punts han d'estar envoltat per altres car�cters\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Si voleu m�s informaci� vegeu http://www.gnupg.org"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Empremta digital:"
+
+#~ msgid "sSmMqQ"
+#~ msgstr "sSmMqQ"
+
+#~ msgid ""
+#~ "Could not find a valid trust path to the key.  Let's see whether we\n"
+#~ "can assign some missing owner trust values.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No s'ha trobat un cam� de confian�a v�lid a la clau. Vegem si podem\n"
+#~ "assignar valors de confian�a no assignats.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "No path leading to one of our keys found.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No s'ha trobat un cam� que condueixe a una de les nostres claus.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "No certificates with undefined trust found.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No s'han trobat certificats amb confian�a no definida.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "No trust values changed.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No s'ha canviat cap valor de confian�a.\n"
+#~ "\n"
+
+#~ msgid "%08lX: no info to calculate a trust probability\n"
+#~ msgstr ""
+#~ "%08lX: no hi ha informaci� per a calcular una probabilitat de confian�a\n"
+
+#~ msgid "Enter the user ID: "
+#~ msgstr "Introdu�u el nom d'usuari: "
+
+#~ msgid "skipped: public key already set with --encrypt-to\n"
+#~ msgstr "ignorat: la clau p�blica ja s'ha especificat amb --encrypt-to\n"
+
+#~ msgid "%s: error checking key: %s\n"
+#~ msgstr "%s: error en la comprovaci� de la clau: %s\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "Segur que voleu crear una clau de signatura i xifratge? "
+
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Realment necessiteu una clau tan llarga? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: no s'ha trobat l'usuari: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "problema en la lectura del certificat: %s\n"
+
+#~ msgid "too many entries in unk cache - disabled\n"
+#~ msgstr ""
+#~ "massa entrades en la mem�ria cau de claus desconegudes - desactivada\n"
+
+#~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
+#~ msgstr "clau secreta %08lX no importada (utilitzeu %s per a permitir-ho)\n"
+
+#~ msgid "key %08lX: our copy has no self-signature\n"
+#~ msgstr "clau %08lX: la nostra c�pia no t� auto-signatura\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: no s'ha trobat l'usuari\n"
+
+#~ msgid "update of trustdb failed: %s\n"
+#~ msgstr "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n"
+
+#~ msgid "no keyserver known (use option --keyserver)\n"
+#~ msgstr "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n"
+
+#~ msgid "%s: not a valid key ID\n"
+#~ msgstr "%s: no �s un ID v�lid\n"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "es suposa MDC erroni a causa d'un bit cr�tic desconegut\n"
+
+#~ msgid "error reading dir record for LID %lu: %s\n"
+#~ msgstr "error al llegir el registre de directori per al LID %lu: %s\n"
+
+#~ msgid "lid %lu: expected dir record, got type %d\n"
+#~ msgstr "lid %lu: s'esperava registre de directori, s'ha obtingut %d\n"
+
+#~ msgid "no primary key for LID %lu\n"
+#~ msgstr "no hi ha una clau prim�ria per al LID %lu\n"
+
+#~ msgid "error reading primary key for LID %lu: %s\n"
+#~ msgstr "error al llegir clau prim�ria per al LID %lu: %s\n"
+
+#~ msgid "get_dir_record: search_record failed: %s\n"
+#~ msgstr "get_dir_record: ha fallat search_record: %s\n"
+
+#~ msgid "key %08lX: query record failed\n"
+#~ msgstr "clau %08lX: la consulta del registre ha fallat\n"
+
+#~ msgid "key %08lX: already in trusted key table\n"
+#~ msgstr "clau %08lX: ja es troba en la taula de claus de confian�a\n"
+
+#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
+#~ msgstr "NOTE: la clau secreta %08lX no est� protegida.\n"
+
+#~ msgid "key %08lX: secret and public key don't match\n"
+#~ msgstr "clau %08lX: les claus p�blica i secreta no coincideixen\n"
+
+#~ msgid "enumerate secret keys failed: %s\n"
+#~ msgstr "no s'ha pogut enumerar les claus secretes: %s\n"
+
+#~ msgid "key %08lX.%lu: Good subkey binding\n"
+#~ msgstr "clau %08lX.%lu: Enlla� de subclau correcta\n"
+
+#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
+#~ msgstr "clau %08lX.%lu: Enlla� de subclau inv�lid: %s\n"
+
+#~ msgid "key %08lX.%lu: Valid key revocation\n"
+#~ msgstr "clau %08lX.%lu: Revocaci� de clau v�lida\n"
+
+#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
+#~ msgstr "clau %08lX.%lu: Revocaci� de clau inv�lida: %s\n"
+
+#~ msgid "key %08lX.%lu: Valid subkey revocation\n"
+#~ msgstr "clau %08lX.%lu: Subclau de revocaci� v�lida\n"
+
+#~ msgid "Good self-signature"
+#~ msgstr "Auto-signatura correcta"
+
+#~ msgid "Invalid self-signature"
+#~ msgstr "Auto-signatura inv�lida"
+
+#~ msgid "Valid user ID revocation skipped due to a newer self signature"
+#~ msgstr ""
+#~ "Revocaci� d'ID d'usuari v�lida ignorada degut a una auto-signatura m�s "
+#~ "recent"
+
+#~ msgid "Valid user ID revocation"
+#~ msgstr "Revocaci� d'ID d'usuari v�lida"
+
+#~ msgid "Invalid user ID revocation"
+#~ msgstr "Revocaci� d'ID d'usuari inv�lida"
+
+#~ msgid "Valid certificate revocation"
+#~ msgstr "Certificat de revocaci� v�lid"
+
+#~ msgid "Good certificate"
+#~ msgstr "Certificat correcte"
+
+#~ msgid "Invalid certificate revocation"
+#~ msgstr "Certificat de revocaci� inv�lid"
+
+#~ msgid "Invalid certificate"
+#~ msgstr "Certificat inv�lid"
+
+#~ msgid "sig record %lu[%d] points to wrong record.\n"
+#~ msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n"
+
+#~ msgid "duplicated certificate - deleted"
+#~ msgstr "certificat duplicat: esborrat"
+
+#~ msgid "tdbio_search_dir failed: %s\n"
+#~ msgstr "tdbio_search_dir ha fallat: %s\n"
+
+#~ msgid "lid ?: insert failed: %s\n"
+#~ msgstr "lid ?: la inserci� ha fallat: %s\n"
+
+#~ msgid "lid %lu: insert failed: %s\n"
+#~ msgstr "lid %lu: la inserci� ha fallat: %s\n"
+
+#~ msgid "lid %lu: inserted\n"
+#~ msgstr "lid %lu: inserit\n"
+
+#~ msgid "error reading dir record: %s\n"
+#~ msgstr "error al llegir el registre de directori: %s\n"
+
+#~ msgid "\t%lu keys with errors\n"
+#~ msgstr "\t%lu claus amb errors\n"
+
+#~ msgid "\t%lu keys inserted\n"
+#~ msgstr "\t%lu claus inserides\n"
+
+#~ msgid "lid %lu: dir record w/o key - skipped\n"
+#~ msgstr "lid %lu: registre de directori sense clau - ignorat\n"
+
+#~ msgid "\t%lu due to new pubkeys\n"
+#~ msgstr "\\t%lu degut a noves claus p�bliques\n"
+
+#~ msgid "\t%lu keys skipped\n"
+#~ msgstr "\t%lu claus ignorades\n"
+
+#~ msgid "\t%lu keys updated\n"
+#~ msgstr "\t%lu clau actualitzades\n"
+
+#~ msgid "Ooops, no keys\n"
+#~ msgstr "Ooops, no hi ha claus\n"
+
+#~ msgid "Ooops, no user IDs\n"
+#~ msgstr "Ooops, no hi ha IDs\n"
+
+#~ msgid "check_trust: search dir record failed: %s\n"
+#~ msgstr "check_trust: ha fallat la cerca en el registre de directori: %s\n"
+
+#~ msgid "key %08lX: insert trust record failed: %s\n"
+#~ msgstr ""
+#~ "clau %08lX: ha fallat la inserci� en la base de dades de confian�a: %s\n"
+
+#~ msgid "key %08lX.%lu: inserted into trustdb\n"
+#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confian�a\n"
+
+#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+#~ msgstr ""
+#~ "clau %08lX.%lu: creada en el futur (salt en el temps o problema de\n"
+#~ "rellotge)\n"
+
+#~ msgid "key %08lX.%lu: expired at %s\n"
+#~ msgstr "clau %08lX.%lu: caducada el %s\n"
+
+#~ msgid "key %08lX.%lu: trust check failed: %s\n"
+#~ msgstr "clau %08lX.%lu: ha fallat la verificaci� de confian�a: %s\n"
+
+#~ msgid "problem finding '%s' in trustdb: %s\n"
+#~ msgstr "problema al cercar �%s� en la base de dades de confian�a: %s\n"
+
+#~ msgid "user '%s' not in trustdb - inserting\n"
+#~ msgstr ""
+#~ "l'usuari �%s� no est� en la base de dades de confian�a - inserint-lo\n"
+
+#~ msgid "failed to put '%s' into trustdb: %s\n"
+#~ msgstr "no s'ha pogut posar �%s� en la base de dades de confian�a - %s\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "AV�S: encara no es poden manejar registres de pref�ncies llargs\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: no s'ha creat l'anell: %s\n"
+
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "No es poden usar claus RSA en aquesta versi�\n"
 
@@ -3790,8 +4838,5 @@ msgstr "No hi ha ajuda disponible per a `%s'"
 #~ msgid "invalid"
 #~ msgstr "inv�lida"
 
-#~ msgid "revoked"
-#~ msgstr "revocada"
-
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "no hi ha clau secreta disponible per al desxifratge\n"
diff --git a/po/cs.po b/po/cs.po
index e84a84878..86111bb3b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-04-20 10:20+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -272,59 +272,59 @@ msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varov�n�: neplatn� velikost random_seed - soubor nepou�it\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu ��st `%s': %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zav��t `%s': %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/da.po b/po/da.po
index a43cb1a1a..bbb40324c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -278,58 +278,58 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/de.po b/po/de.po
index 44d01b574..e1ed8e33d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-08-04 23:22+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -274,58 +274,59 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
+msgstr ""
+"WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -950,7 +951,8 @@ msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
 #: g10/g10.c:1805
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
+msgstr ""
+"WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
 #: g10/g10.c:1815
 msgid "--store [filename]"
@@ -1905,12 +1907,16 @@ msgstr ""
 #: g10/encode.c:419 g10/encode.c:573
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) verletzt die Empf�ngervoreinstellungen\n"
+msgstr ""
+"Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
+"verletzt die Empf�ngervoreinstellungen\n"
 
 #: g10/encode.c:491 g10/sign.c:758
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "Erzwungenes Kompressionsverfahren %s (%d) verletzt die Empf�ngervoreinstellungen.\n"
+msgstr ""
+"Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
+"Empf�ngervoreinstellungen.\n"
 
 #: g10/encode.c:652
 #, c-format
@@ -2275,12 +2281,15 @@ msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 #: g10/import.c:1365
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
+msgstr ""
+"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
 
 #: g10/import.c:1379
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist nicht vorhanden\n"
+msgstr ""
+"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
+"nicht vorhanden\n"
 
 #: g10/import.c:1436
 #, c-format
@@ -2465,19 +2474,26 @@ msgstr ""
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "\nDies wird eine Eigenbeglaubigung sein.\n"
+msgstr ""
+"\n"
+"Dies wird eine Eigenbeglaubigung sein.\n"
 
 #: g10/keyedit.c:605
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "\nWARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert werden.\n"
+msgstr ""
+"\n"
+"WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
+"werden.\n"
 
 #: g10/keyedit.c:610
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "\nDie Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
+msgstr ""
+"\n"
+"Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
 #: g10/keyedit.c:617
 msgid ""
@@ -3074,14 +3090,17 @@ msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
 #: g10/keyedit.c:2225
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "Ein PGP 2.x-artiger Schl�ssel kann nicht als designierter Widerrufer eingetragen werden\n"
+msgstr ""
+"Ein PGP 2.x-artiger Schl�ssel kann nicht als designierter Widerrufer "
+"eingetragen werden\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
 #: g10/keyedit.c:2235
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "Ein Schl�ssel kann nicht als sein eigener designierter Widerrufer agieren\n"
+msgstr ""
+"Ein Schl�ssel kann nicht als sein eigener designierter Widerrufer agieren\n"
 
 #: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
@@ -3724,7 +3743,9 @@ msgstr ""
 #: g10/sign.c:103
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu gro�). Verwende \"unerweiterte\".\n"
+msgstr ""
+"WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu gro�). Verwende "
+"\"unerweiterte\".\n"
 
 #: g10/sign.c:151
 #, c-format
@@ -3751,7 +3772,9 @@ msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
 #: g10/sign.c:644
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte Unterschrift erzeugt werden\n"
+msgstr ""
+"Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
+"Unterschrift erzeugt werden\n"
 
 #: g10/sign.c:665 g10/sign.c:892
 #, c-format
@@ -3761,7 +3784,8 @@ msgstr "%s kann nicht erzeugt werden: %s\n"
 #: g10/sign.c:690
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
+msgstr ""
+"Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
 #: g10/sign.c:784
 msgid "signing:"
diff --git a/po/el.po b/po/el.po
index 6e8146777..4c87ed1db 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-04-29 13:24+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -273,61 +273,61 @@ msgstr "... ���� ����� bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ��� ����� �������� ������ - ���������\n"
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "��������: �� ������ random_seed ����� �����\n"
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "�������������: �� ������ ������� ������� random_seed - ��� �� "
 "��������������\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/eo.po b/po/eo.po
index d69bef383..370b1ab4c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -14,7 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
 #: util/secmem.c:89
@@ -45,7 +46,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "fini"
 
@@ -272,58 +273,59 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +339,7 @@ msgstr ""
 "NE UZU DATENOJN KREITAJN DE �I TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +350,7 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -356,163 +358,163 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[dosieroj]|�ifri dosierojn"
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[dosieroj]|mal�ifri dosierojn"
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "subskribi �losilon loke kaj nerevokeble"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "senintervena aktualigo de fido-datenaro"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -522,192 +524,192 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "ne devigi v3-subskribojn"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "devigi v4-subskribojn"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "ne devigi v4-�losilsubskribojn"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "neniam uzi MDC por �ifrado"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "uzi gpg-agent"
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[dosiero]|skribi statusinformojn al dosiero"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|fidi �i tiun �losilon absolute"
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al PGP-2.x-konduto"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Montri Foto-Identigilojn"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Ne montri Foto-Identigilojn"
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Agordi komandlinion por montri Foto-Identigilojn"
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -715,7 +717,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -735,15 +737,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -753,7 +755,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -761,255 +763,275 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:810
+#: g10/g10.c:817
 #, c-format
 msgid "no values for group \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:997
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "nevalida kiraso"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "nevalida �losilaro"
+
+#: g10/g10.c:1369
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1476
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1489 g10/g10.c:1509
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/g10.c:1525
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/g10.c:1531
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
 #: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1771
+#: g10/g10.c:1805
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:1781
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:2474
+#: g10/g10.c:2509
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1018,15 +1040,15 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
@@ -1460,7 +1482,7 @@ msgstr "   (%d) RSA (nur �ifri)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -1468,7 +1490,7 @@ msgstr "Via elekto? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Uzado de �i tiu algoritmo estas malrekomendata - �u tamen krei? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -1702,7 +1724,7 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
@@ -1794,7 +1816,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1802,7 +1824,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1818,86 +1840,86 @@ msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 msgid "Really create? "
 msgstr "�u vere krei? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ne povas malfermi: %s\n"
 
-#: g10/encode.c:162 g10/sign.c:1035
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "eblas �ifri nur per RSA-�losiloj de maksimume 2048 bitoj kun --pgp2\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:402
+#: g10/encode.c:408
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
 
-#: g10/encode.c:413 g10/encode.c:567
+#: g10/encode.c:419 g10/encode.c:573
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:485 g10/sign.c:758
+#: g10/encode.c:491 g10/sign.c:758
 #, fuzzy, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1926,258 +1948,263 @@ msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:544
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+
+#: g10/import.c:663
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:563 g10/import.c:825
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:641 g10/import.c:848
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
 #. we can't merge secret keys
-#: g10/import.c:785
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:819
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:941
+#: g10/import.c:1060
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -2186,110 +2213,115 @@ msgstr "�losilo %08lX: ignoris sub�losilon\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:1047
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1365
 #, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1247
+#: g10/import.c:1379
 #, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1304
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:154
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:156
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:376
-#, c-format
-msgid "Warning: user ID \"%s\" is not self-signed.\n"
-msgstr ""
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:395
+#: g10/keyedit.c:396
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2300,7 +2332,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:404
+#: g10/keyedit.c:405
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2311,7 +2343,7 @@ msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:419
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2322,7 +2354,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2331,48 +2363,48 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:532
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:534
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:557
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2381,27 +2413,27 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2409,32 +2441,32 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 #, fuzzy
 msgid ""
 "\n"
-"Warning: the signature will not be marked as non-exportable.\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 #, fuzzy
 msgid ""
 "\n"
-"Warning: the signature will not be marked as non-revocable.\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2442,7 +2474,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2450,7 +2482,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2458,7 +2490,7 @@ msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2466,7 +2498,7 @@ msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2474,33 +2506,33 @@ msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2508,7 +2540,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2516,466 +2548,466 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsub"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "subskribi la �losilon nerevokeble"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsub"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "subskribi la �losilon loke kaj nerevokeble"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "alfoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "forfoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "revokita"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "�efa"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "monpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "agpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "aktpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "aktualigitaj preferoj"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "monfoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "montri foto-identigilon"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidi�os: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! sub�losilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:1834
 msgid "There are no preferences on a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1842
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1930
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2984,109 +3016,109 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2225
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2235
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3095,7 +3127,7 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3104,59 +3136,59 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2951
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3170,7 +3202,7 @@ msgstr "Subskribo-gvidlinioj: "
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
@@ -3192,157 +3224,166 @@ msgid "Keyring"
 msgstr "�losilaro"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Fingrospuro:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "listigi �losilojn kaj fingro�purojn"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     �losilo-fingrospuro ="
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     �losilo-fingrospuro ="
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:958
-msgid "             Fingerprint:"
-msgstr "             Fingrospuro:"
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -3360,13 +3401,13 @@ msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
 #: g10/misc.c:386
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
 #: g10/misc.c:418
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
 #: g10/misc.c:443
@@ -3429,7 +3470,7 @@ msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
@@ -3573,42 +3614,41 @@ msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "ne povas akiri �losilon de �losilservilo: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
 
-#: g10/hkp.c:283
+#: g10/hkp.c:287
 msgid "this keyserver is not fully HKP compatible\n"
 msgstr ""
 
-#: g10/hkp.c:493
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "ne povas ser�i �e �losilservilo: %s\n"
@@ -3640,29 +3680,29 @@ msgstr ""
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:210
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�i tio estas PGP-kreita ElGamal-�losilo, kiu NE estas sekura por "
 "subskribado!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
@@ -4049,33 +4089,37 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
@@ -4492,6 +4536,12 @@ msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingrospuro:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "             Fingrospuro:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
diff --git a/po/es.po b/po/es.po
index e6b66a71f..a428e9c73 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-05-01 00:33+0200\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -18,7 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
 #: util/secmem.c:89
@@ -49,7 +50,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "salir"
 
@@ -302,12 +303,12 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener informaci�n de `%s': %s\n"
@@ -317,48 +318,50 @@ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 # Sugerencia a la sugerencia: �qu� tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. Tambi�n se puede poner "descartado".
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s` no es un fichero regular - omitido\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
-msgstr "atenci�n: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr ""
+"atenci�n: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -372,7 +375,7 @@ msgstr ""
 "�NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -388,7 +391,7 @@ msgstr ""
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -396,163 +399,163 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[ficheros]|cifra ficheros"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[ficheros]|descifra ficheros"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "firma la clave no revocablemente"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "firma la clave localmente y no revocablemente"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "actualiza claves desde un servidor de claves"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o de la entrada est�ndar"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o a la entrada est�ndar"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -562,86 +565,86 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "no fuerza firmas v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "fuerza firmas v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "no fuerza firmas v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MDC para cifrar"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "nunca usa un MDC para cifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 # usa
 # Vale.
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "usa el agente gpg"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -651,119 +654,116 @@ msgstr "proceso por lotes: nunca preguntar"
 # Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
 # preguntas no me acaba de gustar.
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[fichero]|escribe informaci�n de estado en el fichero"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "todas las opciones de paquete, cifrado y resumen tipo PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contrase�as"
+msgstr ""
+"|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contrase�as"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Muestra IDs fotogr�ficos"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "No muestra IDs fotogr�ficos"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Ajusta linea de comandos para ver IDs fotogr�ficos"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
-
 # ordenes -> �rdenes
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -771,7 +771,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -791,15 +791,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -809,7 +809,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -817,228 +817,261 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "imposible establecer camino de ejecutables %s\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "ATENCI�N: %s es una opci�n desaconsejada.\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "armadura inv�lida"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "anillo inv�lido"
+
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "por favor use \"--keyserver-options %s\" en su lugar\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "este mensaje podr�a no ser utilizable por PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "URL de pol�tica inv�lida\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "URL de pol�tica de certificado inv�lida\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "preferencias inv�lidas\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
 msgstr "preferencias inv�lidas\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "preferencias inv�lidas\n"
+
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "preferencias inv�lidas\n"
+
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1046,31 +1079,37 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "El primer car�cter de una notaci�n debe ser una letra o un subrayado\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
-msgstr "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, y acabar con un '='\n"
-
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
+"y acabar con un '='\n"
 
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "URL de pol�tica de certificado inv�lida\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "URL de pol�tica inv�lida\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1140,7 +1179,8 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
@@ -1166,11 +1206,13 @@ msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Raz�n para la revocaci�n: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Comentario a la revocaci�n: "
 
 #. a string with valid answers
@@ -1273,8 +1315,10 @@ msgstr "%08lX: clave caducada\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: No hay indicios de que la firma pertenezca realmente al propietario.\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: No hay indicios de que la firma pertenezca realmente al propietario.\n"
 
 #: g10/pkclist.c:448
 #, c-format
@@ -1336,10 +1380,12 @@ msgstr "Nota: �Esta clave ha caducado!\n"
 
 #: g10/pkclist.c:590
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
+msgstr ""
+"ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
 #: g10/pkclist.c:600
@@ -1351,28 +1397,31 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "ATENCI�N: �Esta clave no est� certificada con firmas de suficienteconfianza!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"ATENCI�N: �Esta clave no est� certificada con firmas de "
+"suficienteconfianza!\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1380,120 +1429,130 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "la preferencia %c%lu no es v�lida\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "demasiadas `%c' preferencias\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "escribiendo autofirma\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firmar y cifrar)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (firmar y cifrar)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "El uso de este algoritmo est� desaconsejado - �crear de todas formas?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1506,19 +1565,19 @@ msgstr ""
 "        el tama�o por defecto es 1024 bits\n"
 " el tama�o m�ximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 
@@ -1530,12 +1589,12 @@ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1543,27 +1602,29 @@ msgstr ""
 "No se recomiendan claves de m�s de 2048 bits porque\n"
 "�el tiempo de c�lculo es REALMENTE largo!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
 msgstr ""
 "De acuerdo, �pero tenga en cuenta que las radiaciones de su monitor y\n"
 "teclado tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1579,7 +1640,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1595,30 +1656,30 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1626,14 +1687,15 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -1645,44 +1707,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1693,27 +1755,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Por favor no ponga la direcci�n de correo-e en el nombre real o en el comentario\n"
+msgstr ""
+"Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
+"comentario\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1721,16 +1785,16 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1742,7 +1806,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1755,53 +1819,53 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "clave marcada como de confianza absoluta.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1809,101 +1873,116 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
 "la orden \"--edit-key\" para crear una clave secundaria con este prop�sito.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no se puede abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCI�N: fichero vac�o\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+"no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
+
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no protegida - omitida\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -1913,273 +1992,284 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %08lX inv�lida hecha mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "clave %08lX: uni�n de subclave inv�lida\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: sin identificador de usuario\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "clave %08lX: no hay subclave que unir\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "clave %08lX: clave p�blica importada\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no coincide con nuestra copia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificador de usuario\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "clave %08lX: algoritmo de clave p�blica no disponible para el id \"%s\"\n"
+msgstr ""
+"clave %08lX: algoritmo de clave p�blica no disponible para el id \"%s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave que unir\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: omitido ID de usuario '"
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave omitida\n"
@@ -2188,106 +2278,134 @@ msgstr "clave %08lX: subclave omitida\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "clave %08lX: certificado de revocaci�n en lugar equivocado - omitido\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "Aviso: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %08lX\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgstr ""
+"Aviso: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %"
+"08lX\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "Aviso: la clave %08lX puede estar revocada: clave e revocaci�n %08lXno est� presente.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgstr ""
+"Aviso: la clave %08lX puede estar revocada: clave e revocaci�n %08lXno est� "
+"presente.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "clave %08lX: firma directa de clave a�adida\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "ATENCI�N `%s' es un fichero vac�o\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Su firma actual en \"%s\"\n"
+"es una firma local.\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2296,76 +2414,81 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" ya estaba firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --pgp2.\n"
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
+"pgp2.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "�C�mo de cuidadosamente ha verificado que la clave que est� a punto de\n"
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2373,7 +2496,32 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "esto puede ser debido a la ausencia de autofirma\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"La firma se marcar� como no exportable.\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"La firma se marcar� como no revocable.\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2381,7 +2529,7 @@ msgstr ""
 "\n"
 "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2389,7 +2537,7 @@ msgstr ""
 "\n"
 "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2397,7 +2545,7 @@ msgstr ""
 "\n"
 "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2405,7 +2553,7 @@ msgstr ""
 "\n"
 "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2413,33 +2561,33 @@ msgstr ""
 "\n"
 "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2447,7 +2595,7 @@ msgstr ""
 "Introduzca la nueva contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2455,553 +2603,579 @@ msgstr ""
 "No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "graba"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "ayuda"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "hdac"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "idu"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "clave"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "comprueba"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "firma"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "firmanr"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "firma la clave irrevocablemente"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "firmanrl"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "firma la clave local e irrevocablemente"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "a�aidu"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "a�ade un identificador de usuario"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "a�adirfoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "a�ade un ID fotogr�fico"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "borridu"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "borfoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "a�acla"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "borrcla"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "a�acla"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "a�ade una clave secundaria"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "borrfir"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primaria"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "marca ID de usuario como primario"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "cambia"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "muestra preferencias (experto)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "verpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias (prolijo)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "estpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "establece preferencias"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "actpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "contr"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "cambia la contrase�a"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "conf"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revfir"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revcla"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "descla"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "habcla"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "verfoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "mostrar ID fotogr�fico"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error leyendo bloque de clave secreta `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario para firmar\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "�De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "�De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "�De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "�Actualizar realmente las preferencias para todos los ID seleccionados? "
+msgstr ""
+"�Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "�Actualizar realmente las preferencias? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Esta clave puede ser revocada por %s clave %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (confidencial)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creada: %s expira: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev-  se encontr� una revocaci�n falsificada\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema comprobando la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"AVISO: Esta clave ya tiene identificador fotogr�fico.\n"
-"       A�adir otro ID puede confundir a algunas versiones de PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "�Est� seguro de querer a�adirla? (s/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Solo puede tener un ID fotogr�fico en una clave.\n"
-
-#: g10/keyedit.c:1686
-msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "�Est� seguro de querer a�adirla? (s/N) "
+
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Introduzca la longitud de la clave"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3010,7 +3184,7 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -3019,234 +3193,253 @@ msgstr ""
 "\"\n"
 "firmada localmente con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmada por %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmada por %08lX el %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave 0x%08lX (uid %d)\n"
+msgstr ""
+"Mostrando ID fotogr�fico %s de tama�o %ld para la clave 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Pol�tica de firmas: "
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Pol�tica de firmas: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notaci�n de firma: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Anillo de claves"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "Huella dactilar:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "lista claves y huellas dactilares"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "    Huella de clave ="
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "    Huella de clave ="
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "         Huella dactilar:"
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "    Huella de clave ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "    Huella de clave ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave p�blica es %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "cifrado IDEA indisponible, optimistamente intentando usar %s en su lugar\n"
+msgstr ""
+"cifrado IDEA indisponible, optimistamente intentando usar %s en su lugar\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Firma caducada de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -3261,32 +3454,51 @@ msgstr "�No se deber�an usar algoritmos experimentales!\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s est�ndar!\n"
+msgstr ""
+"ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s "
+"est�ndar!\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permisos inseguros de %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "por favor vea http://www.gnupg.org/why-not-idea.html para m�s informaci�n\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"por favor vea http://www.gnupg.org/why-not-idea.html para m�s informaci�n\n"
+
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "ATENCI�N: %s es una opci�n desaconsejada.\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATENCI�N: %s es una opci�n desaconsejada.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "por favor use \"--keyserver-options %s\" en su lugar\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
@@ -3316,7 +3528,7 @@ msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
@@ -3427,66 +3639,74 @@ msgstr "no hay datos firmados\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatario an�nimo; probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la antigua codificaci�n de la DEK no puede usarse\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave secreta %08lX caducada el %s\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "clave %08lX: �esta clave ha sido revocada!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "solicitando clave %08lX del servidor de claves HKP %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "no puede obtenerse la clave en el servidor: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "envi� correcto a `%s` (estado=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fall� el envio a `%s': status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "no puede buscarse en el servidor: %s\n"
@@ -3519,67 +3739,84 @@ msgstr ""
 "generando la suma de comprobaci�n de 16 bits (desaconsejada) para \n"
 "proteger la clave secreta.\n"
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
-msgstr "�esto es una clave ElGamal generada por PGP que NO es segura para las firmas!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"�esto es una clave ElGamal generada por PGP que NO es segura para las "
+"firmas!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit cr�tico desconocido\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
+
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr ""
+"AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar con claves tipo PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -3602,7 +3839,8 @@ msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 #: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "resgistro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
+msgstr ""
+"resgistro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
 #: g10/tdbio.c:237
 msgid "trustdb transaction too large\n"
@@ -3663,7 +3901,8 @@ msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
@@ -3790,7 +4029,8 @@ msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
 #: g10/trustdb.c:1593
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "comprobando en profundidad %d firmado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"comprobando en profundidad %d firmado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3807,28 +4047,32 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' omitido: duplicado\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' omitido: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
-msgstr "`%s' omitida: esta es una clave ElGamal generada por PGP que NO es segura para las firmas\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"`%s' omitida: esta es una clave ElGamal generada por PGP que NO es segura "
+"para las firmas\n"
 
 #. do not overwrite
 #: g10/openfile.c:84
@@ -3878,8 +4122,10 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "reinicie GnuPG otra vez para que lea el nuevo fichero de opciones\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
@@ -3892,39 +4138,45 @@ msgstr "creada clave d�bil - reintentando\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d intentos!\n"
+msgstr ""
+"�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
+"intentos!\n"
 
 #: g10/seskey.c:200
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "�Eliminar esta clave del anillo? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "�Esta es una clave secreta! �Eliminar realmente? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "borrada informaci�n de propietarios\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
@@ -3959,7 +4211,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si quiere usar esta clave no fiable de todos modos, conteste \"s�\"."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduzca el ID de usuario al que quiere enviar el mensaje."
 
 #: g10/helptext.c:72
@@ -3971,7 +4224,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -4007,15 +4261,23 @@ msgstr ""
 "ya que no todos los programas pueden utilizarlas y las firmas creadas\n"
 "con ellas son bastante grandes y lentas de verificar."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"s�\" o \"no\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4027,21 +4289,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del due�o de la clave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Introduzca una direcci�n de correo electr�nico (opcional pero muy\n"
 "recomendable)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4055,36 +4317,46 @@ msgstr ""
 "O  para continuar con la generaci�n de clave.\n"
 "S  para interrumpir la generaci�n de clave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"s�\" (o s�lo \"s\") para generar la subclave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -4097,7 +4369,8 @@ msgstr ""
 "      comprobado la validez de la clave.\n"
 "\n"
 "\"1\" significa que cree que la clave pertenece a la persona que declara\n"
-"      poseerla pero no pudo o no verific� la clave en absoluto. Esto es �til\n"
+"      poseerla pero no pudo o no verific� la clave en absoluto. Esto es "
+"�til\n"
 "      para una verificaci�n en persona cuando firmas la clave de un usuario\n"
 "      pseudoan�nimo.\n"
 "\n"
@@ -4107,10 +4380,14 @@ msgstr ""
 "\n"
 "\"3\" significa que hizo una comprobaci�n exhaustiva de la clave. Por\n"
 "      ejemplo verificando la huella dactilar de la clave con el propietario\n"
-"      de la clave, y que comprob�, mediante un documento dif�cil de falsificar\n"
-"      con ID fotogr�fico (como un pasaporte) que el nombre del poseedor de la\n"
-"      clave coincide con el ID de usuario en la clave y finalmente que verific�\n"
-"      (intercambiando email) que la direcci�n de email de la clave pertenece\n"
+"      de la clave, y que comprob�, mediante un documento dif�cil de "
+"falsificar\n"
+"      con ID fotogr�fico (como un pasaporte) que el nombre del poseedor de "
+"la\n"
+"      clave coincide con el ID de usuario en la clave y finalmente que "
+"verific�\n"
+"      (intercambiando email) que la direcci�n de email de la clave "
+"pertenece\n"
 "      al poseedor de la clave.\n"
 "\n"
 "Observe que los ejemplos dados en los niveles 2 y 3 son *solo* ejemplos.\n"
@@ -4119,11 +4396,11 @@ msgstr ""
 "\n"
 "Si no sabe qu� contestar, conteste \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Responda \"s�\" si quiere firmar TODOS los IDs de usuario"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4131,11 +4408,11 @@ msgstr ""
 "Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
 "�Tambi�n se perder�n todos los certificados!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"s�\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4145,7 +4422,7 @@ msgstr ""
 "borrar esta firma ya que puede ser importante para establecer una conexi�n\n"
 "de confianza con la clave o con otra clave certificada por �sta."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4157,13 +4434,13 @@ msgstr ""
 "se us�, ya que dicha clave podr�a establecer una conexi�n de confianza\n"
 "a trav�s de otra clave certificada."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Esta firma no es v�lida. Tiene sentido borrarla de su anillo."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4176,7 +4453,7 @@ msgstr ""
 "volver a usar esta clave. As� que b�rrela tan s�lo si esta autofirma no\n"
 "es v�lida por alguna raz�n y hay otra disponible."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4186,25 +4463,25 @@ msgstr ""
 "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
 "de todas las autofirmas afectadas se avanzar� en un segundo.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repita la �ltima contrase�a para asegurarse de lo que tecle�."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduzca el nombre del fichero al que corresponde la firma"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"s�\" para sobreescribir el fichero"
 
 # Sugerencia: ENTER -> INTRO.
 # Aceptada.
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4212,7 +4489,7 @@ msgstr ""
 "Introduzca un nuevo nombre de fichero. Si pulsa INTRO se usar� el fichero\n"
 "por omisi�n (mostrado entre corchetes)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4241,7 +4518,7 @@ msgstr ""
 "      seguir siendo usada; esto se utiliza normalmente para marcar una\n"
 "      direcci�n de correo-e como inv�lida.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4251,11 +4528,11 @@ msgstr ""
 "este certificado de revocaci�n. Por favor, que el texto sea breve.\n"
 "Una l�nea vac�a pone fin al texto.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
@@ -4318,6 +4595,34 @@ msgstr "%lu claves comprobadas (%lu firmas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "El primer car�cter de una notaci�n debe ser una letra o un subrayado\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "AVISO: Esta clave ya tiene identificador fotogr�fico.\n"
+#~ "       A�adir otro ID puede confundir a algunas versiones de PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Solo puede tener un ID fotogr�fico en una clave.\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Huella dactilar:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "         Huella dactilar:"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "�Seguro que quiere una clave de este tama�o? "
@@ -4356,7 +4661,8 @@ msgstr "%s: anillo creado\n"
 #~ "can assign some missing owner trust values.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No puede encontrarse una ruta de confianza v�lida para esta clave. Veamos\n"
+#~ "No puede encontrarse una ruta de confianza v�lida para esta clave. "
+#~ "Veamos\n"
 #~ "si es posible asignar algunos valores de confianza perdidos.\n"
 #~ "\n"
 
@@ -4382,7 +4688,8 @@ msgstr "%s: anillo creado\n"
 #~ "\n"
 
 #~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr "%08lX: no hay informaci�n para calcular la probabilidad de confianza\n"
+#~ msgstr ""
+#~ "%08lX: no hay informaci�n para calcular la probabilidad de confianza\n"
 
 #~ msgid "Enter the user ID: "
 #~ msgstr "Introduzca el ID de usuario: "
@@ -4393,9 +4700,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: error comprobando la clave: %s\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (firmar y cifrar)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "�De verdad quiere crear una clave de firma y cifrado? "
 
@@ -4487,7 +4791,8 @@ msgstr "%s: anillo creado\n"
 #~ msgstr "Autofirma inv�lida"
 
 #~ msgid "Valid user ID revocation skipped due to a newer self signature"
-#~ msgstr "Revocaci�n v�lida de ID de usuario omitida, existe autofirma m�s reciente"
+#~ msgstr ""
+#~ "Revocaci�n v�lida de ID de usuario omitida, existe autofirma m�s reciente"
 
 #~ msgid "Valid user ID revocation"
 #~ msgstr "Revocaci�n de ID de usuario v�lida"
@@ -4583,7 +4888,8 @@ msgstr "%s: anillo creado\n"
 #~ msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 
 #~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
+#~ msgstr ""
+#~ "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: no se puede crear el anillo: %s\n"
@@ -4604,8 +4910,12 @@ msgstr "%s: anillo creado\n"
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "clave secreta para descifrado no disponible\n"
 
-#~ msgid "RSA keys are deprecated; please consider creating a new key and use this key in the future\n"
-#~ msgstr "Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave para futuros usos\n"
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this "
+#~ "key in the future\n"
+#~ msgstr ""
+#~ "Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave "
+#~ "para futuros usos\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "establece los par�metros de depuraci�n"
diff --git a/po/et.po b/po/et.po
index 25f70f2f7..d6c84940c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-05-10 08:47+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -14,7 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Hoiatus: kasutan ebaturvalist m�lu!\n"
 
 #: util/secmem.c:89
@@ -45,7 +46,7 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "v�lju"
 
@@ -272,58 +273,59 @@ msgstr "... see on viga (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "m�rkus: random_seed fail on t�hi\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "hoiatus: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei �nnestu lugeda: %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +339,7 @@ msgstr ""
 "�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +350,7 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -356,163 +358,163 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[failid]|kr�pteeri failid"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "ainult salvesta"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[failid]|dekr�pteeri failid"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "allkirjasta v�ti mitte-t�histatavana"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "allkirjasta v�ti lokaalselt ja mitte-t�histatavana"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "n�ita ainult pakettide j�rjendeid"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "ekspordi usalduse v��rtused"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "hooldusvaba usalduse andmebaasi uuendamine"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "paranda vigane usalduse andmebaas"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend lahti"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -522,196 +524,192 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "�ra kasuta v3 allkirju"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "kasuta v4 v�tme allkirju"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "�ra kasuta v3 v�tme allkirju"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "kr�ptimisel �ra kasuta kunagi MDC"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "kasuta gpg-agenti"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "loe v�tmed failist"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[fail]|kirjuta olekuinfo faili"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "kasuta k�ikide pakettide, �iffrite ja l�hendi seadeid PGP 2.x moodis"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|kasuta parooli moodi N"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "�ra lisa kr�ptimisel v�tme id"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Esita foto IDd"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Ei esita foto IDd"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Sea k�surida foto ID vaatamiseks"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -719,7 +717,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -739,15 +737,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -757,7 +755,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -765,258 +763,296 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "vigane pakend"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: vigane faili versioon %d\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "vigane v�tmehoidla"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
+msgstr ""
+"--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "see teade ei pruugi olla PGP 2.x programmidega kasutatav\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "antud allkirja poliisi URL on vigane\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "antud sertifikaadi poliisi URL on vigane\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi kontrolli mood; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
 msgstr "vigased eelistused\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "vigased eelistused\n"
+
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ei �nnestu avada: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane teatel�hendi algoritm `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "noteerimise nimes v�ivad olla ainult t�hed, numbrid, punktid ja alakriipsud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "antud sertifikaadi poliisi URL on vigane\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "antud allkirja poliisi URL on vigane\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1086,8 +1122,10 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
 #: g10/pkclist.c:61
 msgid "No reason specified"
@@ -1110,11 +1148,13 @@ msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "T�histamise p�hjus: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "T�histamise kommentaar: "
 
 #. a string with valid answers
@@ -1217,7 +1257,8 @@ msgstr "%08lX: v�ti on aegunud\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
 #: g10/pkclist.c:448
@@ -1283,7 +1324,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
 #: g10/pkclist.c:600
@@ -1295,28 +1337,31 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava allkirjaga!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
+"allkirjaga!\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1324,120 +1369,130 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "eelistus %c%lu ei ole lubatud\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "kirjutan iseenda allkirja\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1450,19 +1505,19 @@ msgstr ""
 "            vaikimisi v�tmepikkus on 1024 bitti\n"
 "    suurim soovitatav v�tmepikkus on 2048 bitti\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
 
@@ -1474,12 +1529,12 @@ msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "v�tmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1487,27 +1542,29 @@ msgstr ""
 "Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
 "arvutused v�tavad V�GA palju aega!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
 msgstr ""
 "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
 "v�imalikud r�ndeobjektid!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1523,7 +1580,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1539,30 +1596,30 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1570,14 +1627,15 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -1588,44 +1646,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1636,27 +1694,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1664,16 +1722,16 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1685,7 +1743,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1697,53 +1755,53 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1752,97 +1810,112 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Loon t�esti? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ei �nnestu avada: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: HOIATUS: t�hi fail\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
+msgstr ""
+"RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
+
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s kr�ptitud kasutajale: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
@@ -1852,271 +1925,285 @@ msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid kasutamisega\n"
+msgstr ""
+"Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
+"kasutamisega\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
+msgstr ""
+"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti on imporditud\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: 1 uus kasutaja ID\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: %d uut kasutaja IDd\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: 1 uus allkiri\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: %d uut allkirja\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: 1 uus alamv�ti\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: %d uut alamv�tit\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "v�ti %08lX: ei muudetud\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
+msgstr ""
+"v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
@@ -2125,106 +2212,133 @@ msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "Hoiatus: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgstr ""
+"Hoiatus: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "Hoiatus: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgstr ""
+"Hoiatus: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "HOIATUS: `%s' on t�hi fail\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Teie praegune allkiri \"%s\"\n"
+"on lokaalne allkiri.\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2233,76 +2347,80 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
+msgstr ""
+"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Kui hoolikalt te olete kontrollinud et v�ti, mida te asute allkirjastama,\n"
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2310,7 +2428,32 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Allkiri m�rgitakse mitte-eksporditavaks.\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2318,7 +2461,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2326,7 +2469,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2334,7 +2477,7 @@ msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2342,7 +2485,7 @@ msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2350,33 +2493,33 @@ msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2384,7 +2527,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2392,552 +2535,578 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "vali sekundaarne v�ti N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "n�ita allkirju"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "allkirjasta v�ti"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "allkirjasta v�ti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "lisa foto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "lisa sekundaarne v�ti"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "lisa sekundaarne v�ti"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primaarne"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "l�lita"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "n�ita foto ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamv�ti on t�histatud: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud v�ltsitud t�histamine\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1574
-msgid ""
-"Please note that the shown key validity is not necessary correct\n"
-"unless you restart the program.\n"
-msgstr "Tuleb t�hele panna, et kuni te pole programmi uuesti k�ivitanud,ei pruugi n�idatud v�tme kehtivus olla tingimata korrektne.\n"
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1842
+#, fuzzy
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
-"HOIATUS: Sellel v�tmel on juba foto ID.\n"
-"         J�rgmise foto ID lisamine v�ib tekitada segadusi m�ne PGP\n"
-"         versiooni kasutamisel.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "V�tmel v�ib olla ainult �ks foto ID.\n"
+"Tuleb t�hele panna, et kuni te pole programmi uuesti k�ivitanud,ei pruugi "
+"n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
+
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Sisestage v�tmepikkus"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -2946,7 +3115,7 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -2955,234 +3124,251 @@ msgstr ""
 "\"\n"
 "lokaalselt allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Allkirja poliitika: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Allkirja noteerimine: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "S�rmej�lg:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "n�ita v�tmeid ja s�rmej�lgi"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     V�tme s�rmej�lg ="
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "               S�rmej�lg:"
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     V�tme s�rmej�lg ="
+
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Noteering: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Poliis: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -3197,32 +3383,49 @@ msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "see �ifri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
+msgstr ""
+"see �ifri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -3252,7 +3455,7 @@ msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
@@ -3363,66 +3566,74 @@ msgstr "allkirjastatud andmeid pole\n"
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "v�ti %08lX: v�ti on t�histatud!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "k�sin v�tit %08lX HKP v�tmeserverist %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "v�tmeserverist ei saa v�tit: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "teate saatmine serverile `%s' �nnestus (olek=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "v�tmeserverist ei saa otsida: %s\n"
@@ -3451,69 +3662,89 @@ msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
 #: g10/seckey-cert.c:311
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
+msgstr ""
+"loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
-msgstr "see on PGP genereeritud ElGamal v�ti ja EI OLE allkirjastamiseks turvaline!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"see on PGP genereeritud ElGamal v�ti ja EI OLE allkirjastamiseks turvaline!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "avalik v�ti on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu vigast allkirja\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
+"kompaktset.\n"
+
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan kompaktset.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr ""
+"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
+"kompaktset.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s allkiri kasutajalt: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "PGP 2.x stiilis v�tmetega saab allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
+msgstr ""
+"PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -3597,7 +3828,8 @@ msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
@@ -3722,7 +3954,8 @@ msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 #: g10/trustdb.c:1593
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "kontrollin s�gavusel %d allkirjastatud=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"kontrollin s�gavusel %d allkirjastatud=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3739,27 +3972,30 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
+msgstr ""
+"v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
 msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
@@ -3812,7 +4048,8 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "te peate GnuPG uuesti k�ivitama, siis v�etakse uued v�tmed arvesse\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
 
 #: g10/encr-data.c:98
@@ -3826,39 +4063,45 @@ msgstr "loodi n�rk v�ti - proovin uuesti\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %d korda!\n"
+msgstr ""
+"s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
+"d korda!\n"
 
 #: g10/seskey.c:200
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "pakettmoodis ei �nnestu seda v�tmeta teha \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Kustutan selle v�tme v�tmehoidlast? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "omaniku usalduse info puhastatud\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
@@ -3889,10 +4132,12 @@ msgstr "Kui te ikkagi soovite kasutada seda kehtetut v�tit, vastake \"jah\"."
 
 #: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
+msgstr ""
+"Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
 
 #: g10/helptext.c:72
@@ -3904,7 +4149,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -3941,15 +4187,23 @@ msgstr ""
 "kasutamine soovitatav, kuna mitte k�ik programmid ei toeta neid\n"
 "ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Sisestage v�tmepikkus"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" v�i \"ei\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -3961,19 +4215,19 @@ msgstr ""
 "saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
 "t�lgendada vahemikuna."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Sisestage v�tmehoidja nimi"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Te v�ite n��d sisestada kommentaari"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -3987,36 +4241,46 @@ msgstr ""
 "O  et j�tkata v�tme loomist.\n"
 "V  et l�petada v�tme loomine."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastake \"jah\" (v�i \"j\"), kui v�ib alustada alamv�tme loomisega."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -4027,32 +4291,36 @@ msgstr ""
 "\n"
 "\"0\" t�hendab, et te ei v�ida oma kontrollimise kohta midagi.\n"
 "\n"
-"\"1\" t�hendab, et te usute, et v�tit omab isik, kes seda v�idab omavat, kuid\n"
+"\"1\" t�hendab, et te usute, et v�tit omab isik, kes seda v�idab omavat, "
+"kuid\n"
 "    te ei saanud v�i ei soovinud seda v�idet t�iendavalt kontrollida. See\n"
 "    on kasulik \"persooni\" kontrolliks, kui te allkirjastate isiku pseudo-\n"
 "    n��mi v�tit.\n"
 "\n"
 "\"2\" t�hendab, et te teostasite v�tme pealiskaudset kontrolli. See v�ib\n"
-"    n�iteks t�hendada, et te kontrollisite v�tme s�rmej�lge ja kontrollisite\n"
+"    n�iteks t�hendada, et te kontrollisite v�tme s�rmej�lge ja "
+"kontrollisite\n"
 "    v�tme kasutaja ID foto ID vastu.\n"
 "\n"
-"\"3\" t�hendab, et te teostasite v�tme p�hjalikku kontrolli. See v�ib n�iteks\n"
+"\"3\" t�hendab, et te teostasite v�tme p�hjalikku kontrolli. See v�ib "
+"n�iteks\n"
 "    t�hendada, et v�rdlesite v�tme s�rmej�lge v�rme omanikuga otse suheldes\n"
 "    ja et te kontrollisite raskesti v�ltsitavast allikast (nt. pass) et\n"
 "    v�tme omaniku nimi vastab v�tmel n�idatud kasutaja IDle ja te kontrol-\n"
 "    lisite, et v�tmel n�idatud e-posti aadress kuulub v�tme omanikule.\n"
 "\n"
 "pange t�hele, et n�ited tasemete 2 ja 3 juures on *ainult* n�ited. S�ltub\n"
-"ainult teist, milline on \"pealiskaudse\" ja \"p�hjaliku\" kontrolli t�hendus,\n"
+"ainult teist, milline on \"pealiskaudse\" ja \"p�hjaliku\" kontrolli "
+"t�hendus,\n"
 "kui te allkirjastate teisi v�tmeid.\n"
 "\n"
 "Kui te ei tea �iget vastust, vastake \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4060,11 +4328,11 @@ msgstr ""
 "Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4074,7 +4342,7 @@ msgstr ""
 "kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
 "antud v�tmega sertifitseeritud teise v�tme usaldatavust."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4086,13 +4354,13 @@ msgstr ""
 "kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
 "sertifitseeritud v�tme."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Allkiri ei ole kehtiv. Oleks m�istlik see v�tmehoidlast kustutada."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4106,7 +4374,7 @@ msgstr ""
 "vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
 "olemas ka teine allkiri, mis kasutajat v�tmega seob."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4116,23 +4384,23 @@ msgstr ""
 "vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
 "ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4140,7 +4408,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4166,9 +4434,10 @@ msgstr ""
 "      Kasutage seda, kui te ei kasuta enam seda v�tit.\n"
 "  \"Kasutaja ID ei ole enam kehtiv\"\n"
 "      Kasutage seda m�rkimaks, et konkreetset kasutaja ID ei peaks enam\n"
-"      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti aadressi.\n"
+"      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
+"aadressi.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4178,11 +4447,11 @@ msgstr ""
 "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
 "l�hidalt. T�hi rida l�petab teksti.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
@@ -4244,3 +4513,31 @@ msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "HOIATUS: Sellel v�tmel on juba foto ID.\n"
+#~ "         J�rgmise foto ID lisamine v�ib tekitada segadusi m�ne PGP\n"
+#~ "         versiooni kasutamisel.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "V�tmel v�ib olla ainult �ks foto ID.\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "S�rmej�lg:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "               S�rmej�lg:"
diff --git a/po/fr.po b/po/fr.po
index 427da3234..bf1336a86 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-06-24 02:06+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -19,7 +19,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Avertissement: l'utilisation de la m�moire n'est pas s�re !\n"
 
 #: util/secmem.c:89
@@ -52,7 +53,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "quitter"
 
@@ -279,60 +280,62 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "avertissement: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
+msgstr ""
+"ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -346,7 +349,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -357,7 +360,7 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -365,163 +368,163 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "[fichier]|chiffrer les fichiers"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[fichiers]|d�chiffrer les fichiers"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "signer une cl� irr�vocablement"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "signer une cl� localement et irr�vocablement"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "mise � jour inattendue de la base de confiance"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -531,203 +534,199 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "ne pas forcer les signatures en v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "forcer les signatures en v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "ne pas forcer les signatures en v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr ""
 "ne jamais utiliser de sceau pour le\n"
 "chiffrement"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "utiliser gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "indiquer o� est une cl� list�e"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[fichier]|�crire les informations d'�tat vers ce fichier"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCL�|donner une confiance ultime � cette cl�"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "utiliser le comportement de PGP 2.x\n"
 "pour toutes les options de paquets,\n"
 "de hachage et de chiffrement"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Montrer les photos d'identit�"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Ne pas montrer les photos d'identit�"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Choisir la ligne de commande servant �\n"
 "afficher les photos d'identit�"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -735,7 +734,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -755,17 +754,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -775,7 +774,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -783,264 +782,301 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "AVERTISSEMENT: `%s' est une option d�conseill�e.\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "armure invalide"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: version %d du fichier invalide\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "porte-cl�s invalide"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "utilisez \"--keyserver-options %s\" � la place\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
+msgstr ""
+"chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "ce message ne sera pas forc�ment utilisable par PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "l'URL de politique de signature donn�e est invalide\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "l'URL de politique de certification donn�e est invalide\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level invalide; ce doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "pr�f�rences invalides\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "pr�f�rences invalides\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences invalides\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "pr�f�rences invalides\n"
+
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
-"de soulignement\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "le nom d'une notation ne doit comporter que des lettres, des chiffres,\n"
-"des points ou des traits de soulignement et doit se terminer par un signe �gal\n"
+"des points ou des traits de soulignement et doit se terminer par un signe "
+"�gal\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "les points dans le nom d'une notation doivent �tre entour�s d'autes caract�res\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "l'URL de politique de certification donn�e est invalide\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "l'URL de politique de signature donn�e est invalide\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1110,7 +1146,8 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
@@ -1136,11 +1173,13 @@ msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Cause de r�vocation: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Commentaire de r�vocation: "
 
 #. a string with valid answers
@@ -1242,7 +1281,8 @@ msgstr "%08lX: la cl� a expir�\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
 msgstr "%08lX: Rien ne dit que la cl� appartient vraiment au propri�taire.\n"
 
 #: g10/pkclist.c:448
@@ -1305,11 +1345,14 @@ msgstr "Note: Cette cl� a expir� !\n"
 
 #: g10/pkclist.c:590
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
+msgstr ""
+"ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "           Rien ne dit que la signature appartient � son propri�taire.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"           Rien ne dit que la signature appartient � son propri�taire.\n"
 
 #: g10/pkclist.c:600
 msgid "WARNING: We do NOT trust this key!\n"
@@ -1320,31 +1363,35 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "            Il n'est pas s�r que la signature appartient � son propri�taire.\n"
+msgstr ""
+"            Il n'est pas s�r que la signature appartient � son "
+"propri�taire.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez\n"
 "utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1352,124 +1399,135 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le r�cipient par d�faut\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "la pr�f�rence %c%lu n'est pas valide\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "pr�f�rence %c%lu dupliqu�e\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "trop de pr�f�rences `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "�criture de l'auto-signature\n"
+
+# g10/keygen.c:123 ???
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par d�faut)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (signature et chiffrement)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "L'utilisation de cet algorithme est d�conseill� - faut-il quand-m�me\n"
 "cr�er la cl� ?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1482,19 +1540,19 @@ msgstr ""
 "          la taille par d�faut est 1024 bits\n"
 " la taille maximale conseill�e est 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
@@ -1506,12 +1564,12 @@ msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1519,27 +1577,29 @@ msgstr ""
 "Les tailles sup�rieures � 2048 ne sont pas conseill�es car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous s�r de vouloir cette taille ? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
 msgstr ""
 "D'accord, mais n'oubliez pas que les radiations de votre �cran et de votre\n"
 "clavier sont aussi tr�s vuln�rables aux attaques !\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1555,7 +1615,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1571,30 +1631,30 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expire le %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1602,14 +1662,15 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -1621,44 +1682,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1669,27 +1730,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
+msgstr ""
+"Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1697,16 +1759,16 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1718,7 +1780,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1730,53 +1792,55 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
+msgstr ""
+"aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
+msgstr ""
+"aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "cl� marqu�e comme ayant une confiance ultime.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1785,106 +1849,123 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
+msgstr ""
+"NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossible d'ouvrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
 "en mode --pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
 "lesquelles vous chiffrez.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
+"pr�f�rences\n"
+
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffr� pour: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "cl� '%s' introuvable: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "cl� %08lX: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
@@ -1894,277 +1975,288 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "La cl� invalide %08lX a �t� rendue valide par --allow-non-selfsigned-uid\n"
+msgstr ""
+"La cl� invalide %08lX a �t� rendue valide par --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la cl� secondaire %08lX � la place de la cl�\n"
 "principale %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "cl� %08lX: nom d'utilisateur non auto-sign� accept� '%s':\n"
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "cl� %08lX: cl� publique import�e\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "cl� %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "cl� %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "cl� %08lX: une nouvelle signature\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "cl� %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "cl� %08lX: une nouvelle sous-cl�\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "cl� %08lX: %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "cl� %08lX: n'a pas chang�\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "cl� %08lX: cl� secr�te import�e\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "cl� %08lX: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %08lX: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "cl� %08lX: certificat de r�vocation import�\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "cl� %08lX: algorithme de cl� publique non support� sur le nom\n"
 "d'utilisateur \"%s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "cl� %08lX: auto-signature sur le nom d'utilisateur \"%s\" invalide\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "cl� %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX: sous-cl� non prise en compte\n"
@@ -2173,110 +2265,134 @@ msgstr "cl� %08lX: sous-cl� non prise en compte\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "cl� %08lX: signature non exportable (classe %02x) - ignor�e\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
 
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Attention: la cl� %08lX est peut-�tre r�voqu�e: recherche de la cl� de\n"
 "r�vocation %08lX\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Attention: la cl� %08lX est peut-�tre r�voqu�e: la cl� de r�vocation\n"
 "%08lX est absente.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "cl� %08lX: ajout de la signature de cl� directe\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous sur de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Votre signature actuelle sur \"%s\"\n"
+"est locale.\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2285,78 +2401,81 @@ msgstr ""
 "Votre signature actuelle sur \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
 msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP sur une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Avec quel soin avez-vous v�rifi� que la cl� que vous allez signer\n"
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2364,7 +2483,32 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "cela peut provenir d'une auto-signature manquante\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"La signature sera marqu�e comme non-exportable.\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"La signature sera marqu�e comme non-r�vocable.\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2372,7 +2516,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2380,7 +2524,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2388,7 +2532,7 @@ msgstr ""
 "\n"
 "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2396,7 +2540,7 @@ msgstr ""
 "\n"
 "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2404,39 +2548,39 @@ msgstr ""
 "\n"
 "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2445,556 +2589,581 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsigner"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "signer la cl� de fa�on non-r�vocable"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsigner"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "signer la cl� de fa�on locale et non-r�vocable"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "aj.photo"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "suppr.photo"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "aj.cl�"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "ajouter une cl� secondaire"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "principale"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "montr.pr�f"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "mettre.pr�f"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "donner la liste de pr�f�rences"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "pr�f.m�j"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "pr�f�rences mises � jour"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "d�sactiver"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "activer une cl�"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "montr.photo"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "montrer la photo d'identit�"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Enlever r�ellement les pr�f�rences des utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  cr��e: %s expire: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la sous-cl� a �t� r�voqu�e: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probl�me de v�rification de la r�vocation: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte � moins de red�marrer le programme.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"ATTENTION: Cette cl� poss�de d�j� une photo d'identit�.\n"
-"           Ajouter une autre photo d'identit� peut poser des\n"
-"           probl�mes avec certaines versions de PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Etes-vous sur de vouloir l'ajouter ? (y/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Vous ne pouvez avoir qu'une seule photo d'identit� par cl�.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "ATTENTION: C'est une cl� du style PGP2.  Ajouter une photo\n"
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Etes-vous sur de vouloir l'ajouter ? (y/N) "
+
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
+msgstr ""
+"Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Entrez la taille de la cl�"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "cl� %08lX: auto-signature sur le nom d'utilisateur \"%s\" invalide\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3003,7 +3172,7 @@ msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -3012,236 +3181,254 @@ msgstr ""
 "\"\n"
 "sign� localement avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous sur de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   sign� par %08lX � %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   sign� par %08lX � %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Affichage %s photo d'identit� de taille %ld pour la cl� 0x%08lX (uid %d)\n"
+msgstr ""
+"Affichage %s photo d'identit� de taille %ld pour la cl� 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Politique de signature: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notation de signature: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "Empreinte:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "lister les cl�s et les empreintes"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr " Empreinte de la cl� ="
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "              Empreinte :"
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr " Empreinte de la cl� ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr " Empreinte de la cl� ="
+
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr " Empreinte de la cl� ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la cl� publique est %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %08lX, cr��e le %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffr� avec une cl� %s, %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-�tre\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Signature expir�e de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -3260,30 +3447,47 @@ msgstr ""
 "Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
 "plus standard !\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Attention: propri�taire de %s \"%s\" peu s�r\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Attention: permissions de %s \"%s\" peu s�res\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
+
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "AVERTISSEMENT: `%s' est une option d�conseill�e.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTISSEMENT: `%s' est une option d�conseill�e.\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "utilisez \"--keyserver-options %s\" � la place\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
@@ -3304,7 +3508,8 @@ msgstr ""
 
 #: g10/passphrase.c:465
 msgid "can't get server write FD for the agent\n"
-msgstr "impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
+msgstr ""
+"impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
 
 #: g10/passphrase.c:498
 msgid "malformed GPG_AGENT_INFO environment variable\n"
@@ -3315,7 +3520,7 @@ msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
@@ -3429,66 +3634,76 @@ msgstr "pas de donn�es sign�es\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %08lX...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le r�cipient anonyme.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la cl� de chiffrement (DEK) n'est pas support�\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou d�sactiv�\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les pr�f�rences\n"
+msgstr ""
+"NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
+"pr�f�rences\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "cl� %08lX: la cl� a �t� r�voqu�e !\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "requ�te de la cl� %08lX du serveur de cl�s HKP %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erreur pendant l'envoi de `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "l'envoi � `%s' s'est d�roul� avec succ�s (r�sultat=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "recherche de \"%s\" du serveur HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossible de chercher une cl� dans le serveur : %s\n"
@@ -3521,77 +3736,94 @@ msgstr ""
 "g�n�ration de la somme de contr�le de 16 bits (d�pr�ci�e) pour prot�ger\n"
 "la cl� secr�te\n"
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
 "signatures !\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu secondes que la signature\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTE: la cl� de signature %08lX a expir� le %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est suppos�e �tre fausse car un bit critique est\n"
 "inconnu\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"AVERTISSEMENT: impossible de faire une expansion � base de %% de l'url\n"
+"de politique (trop grande). Utilisation de la version non expans�e.\n"
+
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'url\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de signer avec des cl�s de style PGP 2.x uniquement\n"
 "en mode --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de cr�er %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
+"pr�f�rences\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -3614,7 +3846,8 @@ msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 #: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
+msgstr ""
+"enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
 
 #: g10/tdbio.c:237
 msgid "trustdb transaction too large\n"
@@ -3675,7 +3908,8 @@ msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
@@ -3759,7 +3993,9 @@ msgstr "cl� %08lX: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 #: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %s\n"
+msgstr ""
+"enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %"
+"s\n"
 
 #: g10/trustdb.c:338
 #, c-format
@@ -3802,7 +4038,8 @@ msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
 #: g10/trustdb.c:1593
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "v�rification � la profondeur %d sign�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"v�rification � la profondeur %d sign�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3821,29 +4058,31 @@ msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' a �t� ignor�: dupliqu�\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a �t� ignor�: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
 msgstr ""
 "`%s' a �t� ignor�e: c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas\n"
 "s�re pour les signatures !\n"
@@ -3898,7 +4137,8 @@ msgstr ""
 "fichier �options�\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
@@ -3922,33 +4162,37 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Enlever cette cl� du porte-cl�s ? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "les informations de confiance au propri�taires ont �t� effac�es\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
@@ -3984,7 +4228,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez �oui�."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Entrez le nom d'utilisateur de la personne � qui vous voulez envoyer\n"
 "le message."
@@ -3998,7 +4243,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -4036,15 +4282,23 @@ msgstr ""
 "conseill�es car tous les programmes ne les supportent pas et les\n"
 "signatures cr��es avec elles sont plut�t longues et tr�s lentes � v�rifier."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la cl�"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�pondez �oui� ou �non�"
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4056,19 +4310,19 @@ msgstr ""
 "mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
 "intervalle."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propri�taire de la cl�"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4082,36 +4336,46 @@ msgstr ""
 "O pour continuer � g�n�rer la cl�.\n"
 "Q pour arr�ter de g�n�rer de cl�."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "R�pondez �oui� (ou simplement �o�) pour g�n�rer la sous-cl�"
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -4143,11 +4407,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4155,11 +4419,11 @@ msgstr ""
 "R�pondez �oui� si vous voulez vraiment supprimer ce nom\n"
 "d'utilisateur. Tous les certificats seront alors perdus en m�me temps !"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "R�pondez �oui� s'il faut vraiment supprimer la sous-cl�"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4170,7 +4434,7 @@ msgstr ""
 "�tablir une connection de confiance vers la cl� ou une autre cl� certifi�e\n"
 "par celle-l�."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4182,7 +4446,7 @@ msgstr ""
 "vous soyez s�r de quelle cl� a �t� utilis�e car cette cl� de signature\n"
 "peut �tablir une connection de confiance vers une autre cl� d�j� certifi�e."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4190,7 +4454,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-cl�s."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4204,7 +4468,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4214,23 +4478,24 @@ msgstr ""
 "ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
 "les auto-signatures affect�es seront avanc�es d'une seconde.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "R�p�tez le dernier mot de passe pour �tre s�r de ce que vous avez tap�."
+msgstr ""
+"R�p�tez le dernier mot de passe pour �tre s�r de ce que vous avez tap�."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donnez le nom du fichier auquel la signature se rapporte"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�pondez �oui� s'il faut vraiment r��crire le fichier"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4238,7 +4503,7 @@ msgstr ""
 "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
 "fichier par d�faut (indiqu� entre crochets) sera utilis�."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4267,7 +4532,7 @@ msgstr ""
 "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4277,11 +4542,11 @@ msgstr ""
 "avez �mis ce certificat de r�vocation. Essayez de garder ce texte concis.\n"
 "Une ligne vide d�limite la fin du texte.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
@@ -4308,7 +4573,8 @@ msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
 #: g10/keyring.c:1235
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
+msgstr ""
+"ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
 #: g10/keyring.c:1237
 #, c-format
@@ -4343,3 +4609,35 @@ msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "le premier caract�re du nom d'une notation doit �tre un lettre ou un "
+#~ "trait\n"
+#~ "de soulignement\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "les points dans le nom d'une notation doivent �tre entour�s d'autes "
+#~ "caract�res\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "ATTENTION: Cette cl� poss�de d�j� une photo d'identit�.\n"
+#~ "           Ajouter une autre photo d'identit� peut poser des\n"
+#~ "           probl�mes avec certaines versions de PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Vous ne pouvez avoir qu'une seule photo d'identit� par cl�.\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Empreinte:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "              Empreinte :"
diff --git a/po/gl.po b/po/gl.po
index 4b26ac218..787a7669e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-05-14 13:21+0200\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -14,7 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Aviso: ��sase unha zona insegura de memoria!\n"
 
 #: util/secmem.c:89
@@ -45,7 +46,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "abandonar"
 
@@ -272,58 +273,59 @@ msgstr "... isto � un erro (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un ficheiro normal - ign�rase\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed est� baleiro\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "aviso: tama�o de random_seed non v�lido - non se emprega\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,7 +340,7 @@ msgstr ""
 "�NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +352,7 @@ msgstr ""
 "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
 "m�is entrop�a (Prec�sanse %d bytes m�is)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +360,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "s� armacenar"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[ficheiros]|descifrar ficheiros"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "asinar unha chave de xeito non revocable"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "asinar unha chave localmente e de xeito non revocable"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listar s� a secuencia de paquetes"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporta-los valores de confianza no propietario"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "actualizaci�n inatendida da base de datos de confianza"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "ama�ar unha base de datos de confianza corrompida"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Quita-la armadura a un ficheiro ou � entrada est�ndar"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "P�r armadura a un ficheiro ou � entrada est�ndar"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,196 +526,196 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "non forzar sinaturas v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "forzar sinaturas de chave v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "non forzar sinaturas de chave v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "nunca usar un MDC para cifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "emprega-lo gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "le-las opci�ns dun ficheiro"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[ficheiro]|escribi-la informaci�n de estado no ficheiro"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCHAVE|confiar absolutamente nesta chave"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emula-lo modo descrito no RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento OpenPGP"
+msgstr ""
+"axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento "
+"OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-msgstr "axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento PGP 2.x"
+msgstr ""
+"axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento PGP 2."
+"x"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Amosar Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Non amosar Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Estabrece-la li�a de comando para ve-las Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOME=VALOR|usar estes datos de notaci�n"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -721,7 +723,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -741,17 +743,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -761,7 +763,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -769,256 +771,297 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "non se puido estabrecer exec-path a %s\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "AVISO: %s � unha opci�n a extinguir.\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "armadura non v�lida"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: versi�n do ficheiro incorrecta %d\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "chaveiro incorrecto"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "empregue \"--keyserver-options %s\" no seu canto\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 activado.\n"
+msgstr ""
+"debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
+"activado.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "esta mensaxe pode non ser utilizable por PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compresi�n debe estar entre %d e %d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "preferencias non v�lidas\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "preferencias non v�lidas\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "preferencias non v�lidas\n"
+
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
 msgstr "preferencias non v�lidas\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "o primeiro car�cter dun nome de notaci�n debe ser unha letra ou gui�n baixo\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
-msgstr "un nome de notaci�n s� debe ter letras, d�xitos, puntos ou gui�ns baixos e rematar con '='\n"
-
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "os puntos dun nome de notaci�n deben estar rodeados por outros caracteres\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"un nome de notaci�n s� debe ter letras, d�xitos, puntos ou gui�ns baixos e "
+"rematar con '='\n"
 
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1088,8 +1131,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "car�cter quoted-printable na armadura - seguramente empregouse un MTA con erros\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
+"erros\n"
 
 #: g10/pkclist.c:61
 msgid "No reason specified"
@@ -1112,11 +1158,13 @@ msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Motivo para a revocaci�n: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Comentario de revocaci�n: "
 
 #. a string with valid answers
@@ -1218,8 +1266,10 @@ msgstr "%08lX: a chave caducou\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
 #: g10/pkclist.c:448
 #, c-format
@@ -1284,8 +1334,10 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
 #: g10/pkclist.c:600
 msgid "WARNING: We do NOT trust this key!\n"
@@ -1296,28 +1348,31 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "AVISO: �Esta chave non est� certificada con sinaturas de suficiente confianza!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
+"confianza!\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1325,120 +1380,131 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
-msgstr "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
+msgstr ""
+"omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "a preferencia %c%lu non � v�lida\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "escribindo a propia sinatura\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (asinar e cifrar)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (asinar e cifrar)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Este algoritmo est� obsoleto - �crear de t�dolos xeitos? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1451,19 +1517,19 @@ msgstr ""
 "        tama�o de chave por defecto: 1024 bits\n"
 " tama�o de chave m�ximo recomendado: 2048 bits\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA s� admite tama�os entre 512 e 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "chave pequena de m�is; 1024 � o menor valor admitido para RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
 
@@ -1475,12 +1541,12 @@ msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "chave grande de m�is; %d � o maior tama�o admitido.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1488,25 +1554,29 @@ msgstr ""
 "�As chaves maiores de 2048 bits non se aconsellan porque\n"
 "os c�lculos levan MOITO tempo!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "�Est� seguro de que quere este tama�o de chave? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
-msgstr "De acordo, �pero te�a en conta que a radiaci�n do monitor e o teclado tam�n son vulnerables a ataques!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"De acordo, �pero te�a en conta que a radiaci�n do monitor e o teclado tam�n "
+"son vulnerables a ataques!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1522,7 +1592,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1538,30 +1608,30 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1569,62 +1639,64 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
 "\n"
-"Precisa un ID de usuario para identifica-la s�a chave; o software constr�e o\n"
+"Precisa un ID de usuario para identifica-la s�a chave; o software constr�e "
+"o\n"
 "id de usuario co Nome, un Comentario e un Enderezo de E-mail deste xeito:\n"
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1635,27 +1707,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
+msgstr ""
+"Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1663,16 +1736,16 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1684,7 +1757,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1696,53 +1769,53 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1751,97 +1824,117 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co reloxo)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
+"reloxo)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co reloxo)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
+"reloxo)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "�Crear realmente? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: non se pode abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro baleiro\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a cifrar.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+"non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
+"cifrar.\n"
+
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: non � unha chave rfc2440 - omitida\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
@@ -1851,279 +1944,293 @@ msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
+msgstr ""
+"Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - ignorada\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "chave %08lX: non hai sub-chave para o enlace da chave\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: 1 novo ID de usuario\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usuario\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova sinatura\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas sinaturas\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova sub-chave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas sub-chaves\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: sin cambios\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s\"\n"
+msgstr ""
+"chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
+"\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
+msgstr ""
+"chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para o enlace da chave\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: pasado por alto o ID de usuario '"
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: pasada por alto a sub-chave\n"
@@ -2132,110 +2239,140 @@ msgstr "chave %08lX: pasada por alto a sub-chave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - pasada por alto\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n no lugar err�neo - pasada\n"
 "por alto\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - pasado por alto\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr ""
+"chave %08lX: certificado de revocaci�n no lugar err�neo - pasada\n"
+"por alto\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mezclado\n"
 
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "Aviso: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %08lX\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgstr ""
+"Aviso: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
+"08lX\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "Aviso: a chave %08lX pode estar revocada: chave de revocaci�n %08lX ausente.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgstr ""
+"Aviso: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
+"ausente.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "AVISO: `%s' � un ficheiro baleiro\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"A s�a sinatura actual en \"%s\"\n"
+"� unha sinatura local.\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2244,75 +2381,79 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2320,7 +2461,32 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"A sinatura hase marcar coma non exportable.\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"A sinatura hase marcar coma non revocable.\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2328,7 +2494,7 @@ msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2336,7 +2502,7 @@ msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2344,7 +2510,7 @@ msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2352,7 +2518,7 @@ msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2360,33 +2526,33 @@ msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2394,7 +2560,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2402,553 +2568,583 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "gardar"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "axuda"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "listar"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "selecciona-la chave secundaria N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "verificar"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "listar sinaturas"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "asina-la chave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "f"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "asina-la chave de xeito non revocable"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "asina-la chave localmente e de xeito non revocable"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "depurar"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "engadir unha chave secundaria"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "engadir unha chave secundaria"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "borrar sinaturas"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "�Seguro que quere actualiza-las preferencias dos IDs de usuario seleccionados? "
+msgstr ""
+"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+"seleccionados? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Esta chave pode estar revocada por %s chave %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! revocouse a subchave: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- atopouse unha revocaci�n falsa\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta ata que reinicie o programa.\n"
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"AVISO: Esta chave xa ten unha identificaci�n fotogr�fica.\n"
-"       Se engade outra pode confundir a algunhas versi�ns de PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "�Est� seguro de que quere engadila? (s/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "S� pode ter unha identificaci�n fotogr�fica nunha chave.\n"
-
-#: g10/keyedit.c:1686
-msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "�Est� seguro de que quere engadila? (s/N) "
+
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo PGP2.\n"
+msgstr ""
+"Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
+"PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (y/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (y/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (y/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (y/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Introduza o tama�o da chave"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr ""
+"chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con �ndice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -2957,7 +3153,7 @@ msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -2966,234 +3162,252 @@ msgstr ""
 "\"\n"
 "asinado localmente coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Firmou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
+msgstr ""
+"Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Normativa de sinaturas: "
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notaci�n de sinaturas: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Chaveiro"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "Pegada dactilar:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "         Pegada dactilar:"
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     Pegada dactilar ="
+
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     Pegada dactilar ="
+
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Normativa: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Asinada o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -3208,32 +3422,51 @@ msgstr "�Os algoritmos experimentais non deber�an ser usados!\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "este algoritmo de cifrado est� obsoleto; por favor, empregue un m�is est�ndar!\n"
+msgstr ""
+"este algoritmo de cifrado est� obsoleto; por favor, empregue un m�is "
+"est�ndar!\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Aviso: propiedade insegura en %s \"%s\"\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "mire en http://www.gnupg.org/why-not-idea.html para obter m�is informaci�n\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"mire en http://www.gnupg.org/why-not-idea.html para obter m�is informaci�n\n"
+
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "AVISO: %s � unha opci�n a extinguir.\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: %s � unha opci�n a extinguir.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "empregue \"--keyserver-options %s\" no seu canto\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
@@ -3263,7 +3496,7 @@ msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
@@ -3374,66 +3607,74 @@ msgstr "non hai datos asinados\n"
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "a codificaci�n vella do DEK non est� soportada\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "chave %08lX: �esta chave est� revocada!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "solicitando a chave %08lX do servidor de chaves HKP %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "non se pode obte-la chave do servidor de chaves: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "�xito ao enviar a `%s' (estado=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fallo ao enviar a `%s': estado=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "non se pode buscar no servidor de chaves: %s\n"
@@ -3458,73 +3699,92 @@ msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra vez.\n"
+msgstr ""
+"AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra "
+"vez.\n"
 
 #: g10/seckey-cert.c:311
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "xerando o checksum de 16-bits a extinguir para a protecci�n da chave secreta\n"
+msgstr ""
+"xerando o checksum de 16-bits a extinguir para a protecci�n da chave "
+"secreta\n"
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
-msgstr "�esta � unha chave ElGamal xerada por PGP que non � segura para sinaturas!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"�esta � unha chave ElGamal xerada por PGP que non � segura para sinaturas!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
-msgstr "asumindo unha sinatura incorrecta debido a un bit cr�tico desco�ecido\n"
+msgstr ""
+"asumindo unha sinatura incorrecta debido a un bit cr�tico desco�ecido\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
+
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -3547,7 +3807,8 @@ msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 #: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
+msgstr ""
+"rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
 
 #: g10/tdbio.c:237
 msgid "trustdb transaction too large\n"
@@ -3608,7 +3869,8 @@ msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
@@ -3665,7 +3927,9 @@ msgstr "%s: non se puido engadir un rexistro: %s\n"
 
 #: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb\".\n"
+msgstr ""
+"a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
+"\".\n"
 
 #: g10/trustdb.c:200
 #, c-format
@@ -3685,7 +3949,8 @@ msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
 #: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
+msgstr ""
+"chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
 
 #: g10/trustdb.c:332
 #, c-format
@@ -3733,7 +3998,9 @@ msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 #: g10/trustdb.c:1593
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "comprobando con profundidade %d asinadas=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"comprobando con profundidade %d asinadas=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+"d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3748,30 +4015,37 @@ msgstr ""
 #: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
+msgstr ""
+"a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "a chave non est� marcada coma insegura - non se pode empregar co xerador de n�meros aleatorios falso\n"
+msgstr ""
+"a chave non est� marcada coma insegura - non se pode empregar co xerador de "
+"n�meros aleatorios falso\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
-msgstr "ignorouse `%s': �esta � unha chave ElGamal xerada por PGP que non � segura para sinaturas!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"ignorouse `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
+"para sinaturas!\n"
 
 #. do not overwrite
 #: g10/openfile.c:84
@@ -3818,10 +4092,12 @@ msgstr "%s: directorio creado\n"
 
 #: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "ten que iniciar GnuPG outra vez para que lea o novo ficheiro de opci�ns\n"
+msgstr ""
+"ten que iniciar GnuPG outra vez para que lea o novo ficheiro de opci�ns\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
 
 #: g10/encr-data.c:98
@@ -3835,39 +4111,46 @@ msgstr "creouse unha chave feble - volvendo a tentalo\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d veces\n"
+msgstr ""
+"non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
+"veces\n"
 
 #: g10/seskey.c:200
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
+msgstr ""
+"iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "�Borrar esta chave do chaveiro? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "borrouse a informaci�n de confianza\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
@@ -3901,7 +4184,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se desexa empregar esta clave na que non se conf�a, conteste \"si\"."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduza o ID de usuario da persoa � que lle quere manda-la mensaxe."
 
 #: g10/helptext.c:72
@@ -3913,7 +4197,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -3950,15 +4235,23 @@ msgstr ""
 "porque non est�n soportadas por t�dolos programas, e as sinaturas\n"
 "creadas con elas son moi grandes e lentas de comprobar."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Introduza o tama�o da chave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -3970,19 +4263,19 @@ msgstr ""
 "boa resposta de erro - no canto diso, o sistema ha tratar de interpreta-lo\n"
 "valor proporcionado coma se fora un intervalo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor, introduza un enderezo de e-mail (opcional pero recomendado)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -3996,36 +4289,46 @@ msgstr ""
 "O  para continuar coa xeraci�n da chave.\n"
 "S  para sa�r da xeraci�n da chave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Conteste \"si\" (ou s� \"s\") se � correcto xerar esta subchave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -4036,19 +4339,23 @@ msgstr ""
 "\n"
 "\"0\" significa que non di nada do coidado co que comprobou a chave.\n"
 "\n"
-"\"1\" significa que cre que a chave pertence � persoa que o afirma, pero non\n"
+"\"1\" significa que cre que a chave pertence � persoa que o afirma, pero "
+"non\n"
 "    puido ou non quixo verifica-la chave. � �til para verificaci�ns de\n"
 "    \"personaxes\", nas que asina a chave dun usuario pseud�nimo.\n"
 "\n"
 "\"2\" significa que fixo unha comprobaci�n informal da chave. Por exemplo,\n"
 "    pode significar que comprobou a pegada dixital da chave e comprobou\n"
-"    a identidade do usuario na chave contra unha identificaci�n fotogr�fica.\n"
+"    a identidade do usuario na chave contra unha identificaci�n "
+"fotogr�fica.\n"
 "\n"
 "\"3\" significa que fixo unha comprobaci�n extensiva da chave. Por exemplo,\n"
 "    pode significar que comprobou a pegada dixital da chave co propietario\n"
-"    da chave en persoa, e que comprobou, cun documento dif�cil de falsificar\n"
+"    da chave en persoa, e que comprobou, cun documento dif�cil de "
+"falsificar\n"
 "    cunha identificaci�n fotogr�fica (coma o carnet de identidade ou\n"
-"    pasaporte) que o nome do propietario da chave coincide co do identificador\n"
+"    pasaporte) que o nome do propietario da chave coincide co do "
+"identificador\n"
 "    de usuario da chave, e que comprobou (por intercambio de correo\n"
 "    electr�nico) que o enderezo de e-mail da chave pertence ao propietario\n"
 "    da chave.\n"
@@ -4059,11 +4366,11 @@ msgstr ""
 "\n"
 "Se non sabe cal � a resposta correcta, resposte \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Conteste \"si\" se quere asinar T�DOLOS IDs de usuario"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4071,11 +4378,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "�Tam�n se han perder t�dolos certificados!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se � correcto borrar esta subchave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4085,7 +4392,7 @@ msgstr ""
 "sinatura porque pode ser importante para estabrecer unha conexi�n de\n"
 "confianza na chave ou noutra chave certificada por esta chave."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4097,13 +4404,13 @@ msgstr ""
 "se empregou porque esta chave de sinatura poder�a estabrecer unha\n"
 "conexi�n de confianza mediante outra chave xa certificada."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A sinatura non � correcta. Ten sentido borrala do chaveiro."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4117,7 +4424,7 @@ msgstr ""
 "s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
 "unha segunda � s�a disposici�n."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4127,23 +4434,24 @@ msgstr ""
 "� lista actual de preferencias. A marca de tempo de t�dalas auto-sinaturas\n"
 "afectadas ha avanzar un segundo.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Por favor, repita o �ltimo contrasinal, para estar seguro do que tecleou."
+msgstr ""
+"Por favor, repita o �ltimo contrasinal, para estar seguro do que tecleou."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduza o nome do ficheiro ao que corresponde a sinatura"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4151,7 +4459,7 @@ msgstr ""
 "Por favor, introduza un novo nome de ficheiro. Se s� preme ENTER, hase\n"
 "emprega-lo ficheiro por defecto (que se amosa entre corchetes)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4179,7 +4487,7 @@ msgstr ""
 "     Empr�gueo para indicar que o ID de usuario xa non se deber�a empregar;\n"
 "     adoita empregarse para marcar un enderezo de correo non v�lido.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4189,11 +4497,11 @@ msgstr ""
 "certificado de revocaci�n. Por favor, mante�a este texto breve.\n"
 "Unha li�a en branco remata o texto.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Non hai axuda dispo�ible"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
@@ -4256,6 +4564,36 @@ msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOME=VALOR|usar estes datos de notaci�n"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "o primeiro car�cter dun nome de notaci�n debe ser unha letra ou gui�n "
+#~ "baixo\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "os puntos dun nome de notaci�n deben estar rodeados por outros "
+#~ "caracteres\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "AVISO: Esta chave xa ten unha identificaci�n fotogr�fica.\n"
+#~ "       Se engade outra pode confundir a algunhas versi�ns de PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "S� pode ter unha identificaci�n fotogr�fica nunha chave.\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Pegada dactilar:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "         Pegada dactilar:"
+
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "ped�ronse demasiados bits aleatorios; o l�mite � %d\n"
 
@@ -4282,7 +4620,8 @@ msgstr "%s: chaveiro creado\n"
 #~ "can assign some missing owner trust values.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Non se puido atopar unha ruta de confianza v�lida ata a chave. Hase ver se\n"
+#~ "Non se puido atopar unha ruta de confianza v�lida ata a chave. Hase ver "
+#~ "se\n"
 #~ "se pode asignar alg�n valor de confianza non asignado.\n"
 
 #~ msgid ""
@@ -4307,7 +4646,8 @@ msgstr "%s: chaveiro creado\n"
 #~ "\n"
 
 #~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr "%08lX: non hai informaci�n para calcular unha probabilidade de confianza\n"
+#~ msgstr ""
+#~ "%08lX: non hai informaci�n para calcular unha probabilidade de confianza\n"
 
 #~ msgid "Enter the user ID: "
 #~ msgstr "Introduza o ID de usuario: "
@@ -4318,9 +4658,6 @@ msgstr "%s: chaveiro creado\n"
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: erro ao verifica-la chave: %s\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (asinar e cifrar)\n"
-
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "�Seguro que quere crear unha chave para asinar e cifrar? "
 
@@ -4337,7 +4674,8 @@ msgstr "%s: chaveiro creado\n"
 #~ msgstr "demasiadas entradas na cach� de chaves desco�ecidas - desactivada\n"
 
 #~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
-#~ msgstr "non se importou a chave secreta %08lX (empregue %s para permitilo)\n"
+#~ msgstr ""
+#~ "non se importou a chave secreta %08lX (empregue %s para permitilo)\n"
 
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "chave %08lX: a nosa copia non ten auto-sinatura\n"
@@ -4351,7 +4689,8 @@ msgstr "%s: chaveiro creado\n"
 #~ "%s\n"
 
 #~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
+#~ msgstr ""
+#~ "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
 #~ msgid "%s: not a valid key ID\n"
 #~ msgstr "%s: non � un ID de chave v�lido\n"
@@ -4363,7 +4702,8 @@ msgstr "%s: chaveiro creado\n"
 #~ msgstr "erro ao le-lo rexistro de directorio para o LID %lu: %s\n"
 
 #~ msgid "lid %lu: expected dir record, got type %d\n"
-#~ msgstr "lid %lu: esper�base un rexistro de directorio, obt�vose un tipo %d\n"
+#~ msgstr ""
+#~ "lid %lu: esper�base un rexistro de directorio, obt�vose un tipo %d\n"
 
 #~ msgid "no primary key for LID %lu\n"
 #~ msgstr "non hai unha chave primaria para o LID %lu\n"
@@ -4411,7 +4751,9 @@ msgstr "%s: chaveiro creado\n"
 #~ msgstr "Auto-sinatura non v�lida"
 
 #~ msgid "Valid user ID revocation skipped due to a newer self signature"
-#~ msgstr "Om�tese unha revocaci�n de ID de usuario v�lida debido a unha auto-sinatura m�is recente"
+#~ msgstr ""
+#~ "Om�tese unha revocaci�n de ID de usuario v�lida debido a unha auto-"
+#~ "sinatura m�is recente"
 
 #~ msgid "Valid user ID revocation"
 #~ msgstr "Revocaci�n de ID de usuario v�lida"
@@ -4490,7 +4832,8 @@ msgstr "%s: chaveiro creado\n"
 #~ msgstr "chave %08lX.%lu: inserida na base de datos de confianza\n"
 
 #~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
-#~ msgstr "chave %08lX.%lu: creada no futuro (salto no tempo ou problema de reloxo)\n"
+#~ msgstr ""
+#~ "chave %08lX.%lu: creada no futuro (salto no tempo ou problema de reloxo)\n"
 
 #~ msgid "key %08lX.%lu: expired at %s\n"
 #~ msgstr "chave %08lX.%lu: caducou o %s\n"
@@ -4508,7 +4851,8 @@ msgstr "%s: chaveiro creado\n"
 #~ msgstr "erro ao p�r '%s' na base de datos de confianza: %s\n"
 
 #~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr "AVISO: a�nda non se poden manexar rexistros de preferencias longos\n"
+#~ msgstr ""
+#~ "AVISO: a�nda non se poden manexar rexistros de preferencias longos\n"
 
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: non se pode crea-lo chaveiro: %s\n"
@@ -4546,7 +4890,10 @@ msgstr "%s: chaveiro creado\n"
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "non hai chave secreta disponible para desencriptar\n"
 
-#~ msgid "RSA keys are deprecated; please consider creating a new key and use this key in the future\n"
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this "
+#~ "key in the future\n"
 #~ msgstr ""
-#~ "As chaves RSA est�n obsoletas; por favor, considere a opci�n de crear unha\n"
+#~ "As chaves RSA est�n obsoletas; por favor, considere a opci�n de crear "
+#~ "unha\n"
 #~ "chave nova e usa-la no futuro.\n"
diff --git a/po/id.po b/po/id.po
index 80cb0a14a..61f86388e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-07-24 21:11GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -15,12 +15,14 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
+msgstr ""
+"silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -46,7 +48,7 @@ msgstr "tidak"
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "keluar"
 
@@ -273,58 +275,59 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,7 +341,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +352,7 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -357,163 +360,163 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[files]|enkripsi file"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[files]|dekripsi file"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "tandai kunci tidak dapat di-revoke"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "perbarui database trust secara otomatis"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -523,196 +526,192 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "jangan paksa signature v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "paksa signature kunci v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "jangan paksa signature kunci v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "jangan gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "gunakan gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[file]|tulis status info ke file"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percayai kunci ini"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Tampilkan Photo IDs"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Jangan tampilkan Photo IDs"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Set perintah baris untuk melihat Photo IDs"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAME=VALUE|gunakan notasi data ini"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -720,7 +719,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -740,15 +739,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -758,7 +757,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -766,258 +765,301 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr ""
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: versi file %d tidak valid\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "armor tidak valid"
 
-#: g10/g10.c:1251 g10/g10.c:1267
+#: g10/g10.c:1360
 #, fuzzy, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "PERINGATAN: `%s' adalah file kosong\n"
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: versi file %d tidak valid\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "keyring tidak valid"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
+msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "anda hanya dapat membuat signature detached atau clear saat dalam mode --pgp2\n"
+msgstr ""
+"anda hanya dapat membuat signature detached atau clear saat dalam mode --"
+"pgp2\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --pgp2\n"
+msgstr ""
+"anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
+"pgp2\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --pgpg2\n"
+msgstr ""
+"anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
+"pgpg2\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
-#: g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "preferensi tidak valid\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "preferensi tidak valid\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "preferensi tidak valid\n"
+
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
 msgstr "preferensi tidak valid\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
-msgstr "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan diakhiri dengan sebuah '='\n"
-
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
+"diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "URL signature kebijakan yang diberikan tidak valid\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1087,8 +1129,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang mengandung bug\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
+"mengandung bug\n"
 
 #: g10/pkclist.c:61
 msgid "No reason specified"
@@ -1111,11 +1156,13 @@ msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
 #. a string with valid answers
@@ -1218,8 +1265,10 @@ msgstr "%08lX: kunci telah berakhir\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
 #: g10/pkclist.c:448
 #, c-format
@@ -1281,10 +1330,12 @@ msgstr "Catatan: Kunci ini telah berakhir!\n"
 
 #: g10/pkclist.c:590
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
+msgstr ""
+"PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
 #: g10/pkclist.c:600
@@ -1296,28 +1347,30 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1325,121 +1378,131 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "preferensi %c%lu tidak valid\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 #, fuzzy
 msgid "invalid character in preference string\n"
 msgstr "Karakter tidak valid dalam string\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "menulis self signature\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1452,19 +1515,20 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
+msgstr ""
+"keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
@@ -1476,12 +1540,12 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1489,25 +1553,29 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
-msgstr "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah diserang!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
+"diserang!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1523,7 +1591,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1539,30 +1607,30 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1570,61 +1638,63 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
 "\n"
-"Anda perlu sebuah User-ID untuk mengidentifikasi kunci anda; software membuat \n"
+"Anda perlu sebuah User-ID untuk mengidentifikasi kunci anda; software "
+"membuat \n"
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1634,27 +1704,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1662,16 +1732,16 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1679,11 +1749,12 @@ msgid ""
 "\n"
 msgstr ""
 "Anda tidak ingin sebuah passphrase - ini mungkin ide yang *buruk*!\n"
-"Namun saya akan tetap lakukan. Anda dapat merubah passphrase anda setiap saat,\n"
+"Namun saya akan tetap lakukan. Anda dapat merubah passphrase anda setiap "
+"saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1695,152 +1766,171 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 "Perhatikan bahwa kunci ini tidak dapat digunakan untuk enkripsi. Anda \n"
-"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua untuk tujuan ini.\n"
+"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
+"untuk tujuan ini.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: tidak dapat membuka: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --pgp2\n"
+msgstr ""
+"anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
+"pgp2\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+"tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
+
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1850,271 +1940,283 @@ msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --always-trust\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "kunci %08lX: subkey binding tidak valid\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
+
+#: g10/import.c:663
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat pembatalan\n"
+msgstr ""
+"kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
+"pembatalan\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -2123,107 +2225,137 @@ msgstr "kunci %08lX: melewati subkey\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1365
 #, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1145
+#: g10/import.c:1379
 #, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID User \"%s\" dibatalkan.\n"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya?\n"
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr ""
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "PERINGATAN: `%s' adalah file kosong\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Signature anda saat ini pada \"%s\"\n"
+"adalah signature.lokal \n"
+"\n"
+"Apakah anda ingin menjadikannya signature yang full exportable?\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Signature anda saat ini pada \"%s\"\n"
+"adalah signature.lokal \n"
+"\n"
+"Apakah anda ingin menjadikannya signature yang full exportable?\n"
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2234,7 +2366,7 @@ msgstr ""
 "\n"
 "Apakah anda ingin menjadikannya signature yang full exportable?\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2243,74 +2375,79 @@ msgstr ""
 "\n"
 "Apakah anda ingin menjadikannya signature yang full exportable?\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:477
+#: g10/keyedit.c:532
 #, fuzzy
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"Sudah seberapa teliti anda memverifikasi kunci yang akan anda gunakan untuk menandai benar benar milik\n"
+"Sudah seberapa teliti anda memverifikasi kunci yang akan anda gunakan untuk "
+"menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2318,7 +2455,32 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Signature akan ditandai sebagai tidak dapat diekspor.\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2326,7 +2488,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2334,7 +2496,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2342,7 +2504,7 @@ msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2350,7 +2512,7 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2358,33 +2520,33 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2392,7 +2554,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2400,553 +2562,578 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "hapus ID user"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "tambah kunci sekunder"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primer"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan.\n"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Kunci ini mungkin dibatalkan oleh %s kunci %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  diciptakan: %s berakhir: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
+"         of PGP to reject this key.\n"
 msgstr ""
-"PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
-"         Menambahkan photo ID lain dapat membingungkan beberapa versi PGP.\n"
+"PERINGATAN: Ini adalah kunci bergaya PGP2.  Menambahkan sebuah photo ID "
+"dapat menyebabkan beberapa versi\n"
+"          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
+#: g10/keyedit.c:1935
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Anda hanya boleh memiliki satu photo ID untuk satu kunci. \n"
-
-#: g10/keyedit.c:1686
-msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
-"         of PGP to reject this key.\n"
-msgstr ""
-"PERINGATAN: Ini adalah kunci bergaya PGP2.  Menambahkan sebuah photo ID dapat menyebabkan beberapa versi\n"
-"          PGP menolak kunci ini.\n"
-
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Masukkan ukuran kunci"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "kunci %08lX: self-signature tidak valid\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -2955,7 +3142,7 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -2964,237 +3151,254 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Kebijakan signature: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Notasi signature: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Keyring"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "Fingerprint:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "tampilkan kunci dan fingerprint"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     Fingerprint kunci ="
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     Fingerprint kunci ="
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "            Fingerprint:"
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -3209,32 +3413,51 @@ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
+msgstr ""
+"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih lanjut\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih "
+"lanjut\n"
+
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "PERINGATAN: `%s' adalah file kosong\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "PERINGATAN: `%s' adalah file kosong\n"
+
+#: g10/misc.c:658
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -3264,7 +3487,7 @@ msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
@@ -3375,66 +3598,74 @@ msgstr "tidak ada data tertandai\n"
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "kunci %08lX: kunci telah dibatalkan!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "meminta kunci %08lX dari keyserver HKP %s ...\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "tidak dapat memperoleh kunci keyserver: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "success sending to `%s' (status=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "failed sending to `%s': status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "tidak dapat mencari keyserver: %s\n"
@@ -3465,67 +3696,88 @@ msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
-msgstr "ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
+"Menggunakan yang tidak expand.\n"
+
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  Menggunakan yang tidak expand.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr ""
+"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
+"Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
+msgstr ""
+"anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
+"pgp2\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -3752,28 +4004,34 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG palsu!\n"
+msgstr ""
+"kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
+"palsu!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
-msgstr "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman untuk signature!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
+"untuk signature!\n"
 
 #. do not overwrite
 #: g10/openfile.c:84
@@ -3820,11 +4078,14 @@ msgstr "%s: direktori tercipta\n"
 
 #: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n"
+msgstr ""
+"anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
@@ -3837,39 +4098,44 @@ msgstr "kunci lemah tercipta - mengulang\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
+msgstr ""
+"tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
 #: g10/seskey.c:200
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Menghapus kunci ini dari keyring? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
@@ -3879,8 +4145,10 @@ msgid ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan diekspor\n"
-"ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak ada\n"
+"Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan "
+"diekspor\n"
+"ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak "
+"ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
 #: g10/helptext.c:53
@@ -3904,7 +4172,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Masukkan ID user penerima pesan."
 
 #: g10/helptext.c:72
@@ -3916,7 +4185,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -3953,16 +4223,23 @@ msgstr ""
 "karena belum didukung oleh seluruh program dan signature yang dibuat\n"
 "oleh mereka cukup besar dan sangat lambat untuk diverifikasi."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152
-#: g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -3974,19 +4251,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4000,72 +4277,93 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jawab \"ya\" (atau \"y\") jika telah siap membuat subkey."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"Ketika anda menandai user ID pada kunci, anda perlu memverifikasi bahwa kunci\n"
-"milik orang yang disebut dalam user ID.  Ini penting bagi orang lain untuk tahu\n"
+"Ketika anda menandai user ID pada kunci, anda perlu memverifikasi bahwa "
+"kunci\n"
+"milik orang yang disebut dalam user ID.  Ini penting bagi orang lain untuk "
+"tahu\n"
 "seberapa cermat anda memverifikasi ini.\n"
 "\n"
-"\"0\" berarti anda tidak melakukan klaim tentang betapa cermat anda memverifikasi    kunci.\n"
+"\"0\" berarti anda tidak melakukan klaim tentang betapa cermat anda "
+"memverifikasi    kunci.\n"
 "\n"
-"\"1\" berarti anda percaya bahwa kunci dimiliki oleh orang yang mengklaim memilikinya\n"
-"    namun anda tidak dapat, atau tidak memverifikasi kunci sama sekali.  Hal ini bergunabagi\n"
+"\"1\" berarti anda percaya bahwa kunci dimiliki oleh orang yang mengklaim "
+"memilikinya\n"
+"    namun anda tidak dapat, atau tidak memverifikasi kunci sama sekali.  Hal "
+"ini bergunabagi\n"
 "    verifikasi \"persona\", yaitu anda menandai kunci user pseudonymous\n"
 "\n"
-"\"2\" berarti anda melakukan verifikasi kasual atas kunci.  Sebagai contoh, halini dapat\n"
-"    berarti bahwa anda memverifikasi fingerprint kunci dan memeriksa user ID pada kunci\n"
+"\"2\" berarti anda melakukan verifikasi kasual atas kunci.  Sebagai contoh, "
+"halini dapat\n"
+"    berarti bahwa anda memverifikasi fingerprint kunci dan memeriksa user ID "
+"pada kunci\n"
 "    dengan photo ID.\n"
 "\n"
-"\"3\" berarti anda melakukan verifikasi ekstensif atas kunci.  Sebagai contoh, hal ini\n"
+"\"3\" berarti anda melakukan verifikasi ekstensif atas kunci.  Sebagai "
+"contoh, hal ini\n"
 "    dapat berarti anda memverifikasi fingerprint kunci dengan pemilik kunci\n"
-"    secara personal, dan anda memeriksa, dengan menggunakan dokumen yang sulit dipalsukan yang memiliki\n"
+"    secara personal, dan anda memeriksa, dengan menggunakan dokumen yang "
+"sulit dipalsukan yang memiliki\n"
 "    photo ID (seperti paspor) bahwa nama pemilik kunci cocok dengan\n"
-"    nama user ID kunci, dan bahwa anda telah memverifikasi (dengan pertukaran\n"
+"    nama user ID kunci, dan bahwa anda telah memverifikasi (dengan "
+"pertukaran\n"
 "    email) bahwa alamat email pada kunci milik pemilik kunci.\n"
 "\n"
 "Contoh-contoh pada level 2 dan 3 hanyalah contoh.\n"
-"Pada akhirnya, terserah anda untuk memutuskan apa arti  \"kasual\" dan \"ekstensif\"\n"
+"Pada akhirnya, terserah anda untuk memutuskan apa arti  \"kasual\" dan "
+"\"ekstensif\"\n"
 "bagi anda ketika menandai kunci lain.\n"
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4073,11 +4371,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4087,7 +4385,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4099,7 +4397,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4107,7 +4405,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4121,7 +4419,7 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -4132,23 +4430,24 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
+msgstr ""
+"Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4156,7 +4455,7 @@ msgstr ""
 "Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
 "file baku (yang diapit tanda kurung) akan dipakai."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4174,7 +4473,8 @@ msgstr ""
 "Anda harus menspesifikasikan alasan pembatalan. Semua ini tergantung\n"
 "konteks, anda dapat memilih dari daftar berikut:\n"
 " \"Key has been compromised\"\n"
-"      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang tidak berhak\n"
+"      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang "
+"tidak berhak\n"
 "      memiliki akses ke kunci pribadi anda.\n"
 "  \"Key is superseded\"\n"
 "      Gunakan ini bila anda mengganti kunci anda dengan yang baru.\n"
@@ -4182,9 +4482,10 @@ msgstr ""
 "      Gunakan ini bila anda telah mempensiunkan kunci ini.\n"
 "  \"User ID is no longer valid\"\n"
 "      Gunakan ini untuk menyatakan user ID tidak boleh digunakan lagi;\n"
-"      normalnya digunakan untuk menandai bahwa alamat email tidak valid lagi.\n"
+"      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
+"lagi.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4194,11 +4495,11 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -4261,6 +4562,33 @@ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAME=VALUE|gunakan notasi data ini"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
+#~ "         Menambahkan photo ID lain dapat membingungkan beberapa versi "
+#~ "PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Anda hanya boleh memiliki satu photo ID untuk satu kunci. \n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingerprint:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "            Fingerprint:"
+
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "Apakah anda perlu keysize sebesar itu? "
 
diff --git a/po/it.po b/po/it.po
index f42f5b2c8..95ac551eb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-05-09 21:57+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -14,7 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
 #: util/secmem.c:89
@@ -45,7 +46,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
@@ -273,58 +274,61 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un file regolare - ignorato\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed � vuoto\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
-msgstr "attenzione: le dimensioni del file random_seed non sono valide - non usato\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr ""
+"attenzione: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
+msgstr ""
+"ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,7 +342,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +354,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +362,163 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[file]|cifra i file"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[file]|decifra i file"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "firma una chiave irrevocabilmente"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "firma una chiave localmente e irrevocabilmente"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "aggiornamento non presidiato del database della fiducia"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,198 +528,194 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "non forza l'uso di firme v3"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "forza l'uso di firme v4"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "non forza l'uso di firme v4"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "non usa mai un MDC per cifrare"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "usa gpg-agent"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[file]|scrivi le informazioni di stato nel file"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "imposta tutte le opzioni di pacchetto, cifrario e digest per PGP 2.x"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Mostra le fotografie"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Non mostra le fotografie"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Imposta la riga di comando per vedere le fotografie"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|NOME=VALORE|usa questi dati per una nota"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -723,7 +723,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -743,15 +743,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -761,7 +761,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -769,260 +769,297 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "impossibile impostare exec-path a %s\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: versione %d del file non valida\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "ATTENZIONE: %s � una opzione deprecata.\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "armatura non valida"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: versione %d del file non valida\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "portachiavi non valido"
+
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "usa al suo posto \"--keyserver-options %s\"\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
+msgstr ""
+"devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
+msgstr ""
+"nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "questo messaggio pu� non essere utilizzabile da PGP 2.x\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "l'URL della politica di firma indicato non � valido\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "l'URL della politica di certificazione indicato non � valido\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "preferenze non valide\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "preferenze non valide\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
+msgstr "preferenze non valide\n"
+
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
 msgstr "preferenze non valide\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr ""
-"il primo carattere del nome di una nota deve essere una lettera o un\n"
-"underscore\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "l'URL della politica di certificazione indicato non � valido\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "l'URL della politica di firma indicato non � valido\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1092,7 +1129,8 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
@@ -1118,11 +1156,13 @@ msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Ragione della revoca: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Commento alla revoca: "
 
 #. a string with valid answers
@@ -1225,8 +1265,10 @@ msgstr "%08lX: la chiave � scaduta\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
 #: g10/pkclist.c:448
 #, c-format
@@ -1291,8 +1333,10 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
 #: g10/pkclist.c:600
 msgid "WARNING: We do NOT trust this key!\n"
@@ -1303,28 +1347,30 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1332,120 +1378,130 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "saltato: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "la preferenza %c%lu non � valida\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "scrittura della autofirma\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (firma e cifra)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "L'uso di questo algoritmo � deprecato - la creo comunque? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1458,19 +1514,19 @@ msgstr ""
 "          la dimensione predefinita � 1024 bit\n"
 "  la dimensione massima consigliata � 2048 bit\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave � troppo corta; 1024 � il minimo valore permesso per RSA.\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
@@ -1482,12 +1538,12 @@ msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "la chiave � troppo lunga; %d � il massimo valore permesso.\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1495,25 +1551,29 @@ msgstr ""
 "Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
-msgstr "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla tua tastiera sono molto vulnerabili ad attacchi!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
+"tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1529,7 +1589,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1545,30 +1605,30 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1576,61 +1636,64 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
 "\n"
-"Ti serve un User ID per identificare la tua chiave; il software costruisce l'user id a partire da Nome e Cognome, Commento e Indirizzo di Email indicati in questa forma:\n"
+"Ti serve un User ID per identificare la tua chiave; il software costruisce "
+"l'user id a partire da Nome e Cognome, Commento e Indirizzo di Email "
+"indicati in questa forma:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1641,27 +1704,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1669,16 +1732,16 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1690,7 +1753,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1702,157 +1765,175 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 "Nota che questa chiave non pu� essere usata per cifrare. Forse vorrai usare\n"
-"il comando \"--edit-key\" per generare una chiave secondaria per questo scopo.\n"
+"il comando \"--edit-key\" per generare una chiave secondaria per questo "
+"scopo.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di sottochiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 bit\n"
+msgstr ""
+"in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 "
+"bit\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
 "stai cifrando.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
+
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
@@ -1862,273 +1943,284 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "chiave %08lX: legame con la subchiave non valido:\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
+msgstr ""
+"chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -2137,110 +2229,134 @@ msgstr "chiave %08lX: saltata la subchiave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Attenzione: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Attenzione: la chiave %08lX pu� essere stata revocata: la chiave di revoca\n"
 "%08lX non � presente.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "ATTENZIONE: `%s' � un file vuoto\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"La tua firma attuale su \"%s\"\n"
+"� una firma locale.\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2249,76 +2365,81 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP 2.x.\n"
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
+"2.x.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Con quanta attenzione hai verificato che la chiave che stai per firmare\n"
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2326,7 +2447,32 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "questo pu� essere causato da una autofirma mancante\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"La firma sar� marcata come non esportabile.\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"La firma sar� marcata come irrevocabile.\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2334,7 +2480,7 @@ msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2342,7 +2488,7 @@ msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2350,7 +2496,7 @@ msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2358,7 +2504,7 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2366,33 +2512,33 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2400,7 +2546,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2408,554 +2554,580 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "firma la chiave irrevocabilmente"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente e irrevocabilmente"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "aggiungi una chiave secondaria"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "preferenze aggiornate"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "mostra l'ID fotografico"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "Questa chiave pu� essere revocata dalla chiave %s %s%s\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave � stata revocata: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Nota che la validit� della firma indicata non sar� necessariamente corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"ATTENZIONE: Questa chiave ha gi� un ID fotografico.\n"
-"            Aggiungerne un altro pu� confondere alcune versioni di PGP.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "� possibile avere un solo ID fotografico su ogni chiave.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causare il rifiuto della chiave da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
+
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
+msgstr ""
+"Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Inserisci le dimensioni della chiave"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -2965,7 +3137,7 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -2975,234 +3147,252 @@ msgstr ""
 "firmata localmente con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmata da %08lX il %s%s\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
+msgstr ""
+"Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "Politica di firma: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "Annotazione della firma: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Portachiavi"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "Impronta digitale:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "elenca le chiavi e le impronte digitali"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     Impronta digitale ="
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     Impronta digitale ="
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "       Impronta digitale:"
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -3219,30 +3409,48 @@ msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Attenzione: proprietario \"%s\" di %s insicuro\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Attenzione: permessi \"%s\" di %s insicuri\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea.html\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea."
+"html\n"
+
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "ATTENZIONE: %s � una opzione deprecata.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATTENZIONE: %s � una opzione deprecata.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "usa al suo posto \"--keyserver-options %s\"\n"
 
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -3272,7 +3480,7 @@ msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
@@ -3355,7 +3563,8 @@ msgstr "Ripeti la passphrase: "
 
 #: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
+msgstr ""
+"i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
 #: g10/plaintext.c:108
 #, c-format
@@ -3383,66 +3592,75 @@ msgstr "non ci sono dati firmati\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d%s � sconosciuto o disattivato\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
+msgstr ""
+"NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "chiave %08lX: la chiave � stata revocata!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "richiedo la chiave %08lX dal keyserver HKP %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "inviata con successo a `%s' (status=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "invio a `%s' fallito: status=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossibile cercare sul keyserver: %s\n"
@@ -3473,69 +3691,92 @@ msgstr ""
 
 #: g10/seckey-cert.c:311
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "genero il checksum a 16 bit deprecato per la protezione della chiave segreta\n"
+msgstr ""
+"genero il checksum a 16 bit deprecato per la protezione della chiave "
+"segreta\n"
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
-msgstr "questa � una chiave ElGamal generata da PGP e NON � sicura per le firme!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"questa � una chiave ElGamal generata da PGP e NON � sicura per le firme!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la chiave pubblica � %lu secondo pi� recente della firma\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica � %lu secondi pi� recente della firma\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
-msgstr "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
+msgstr ""
+"si suppone una firma non valida a causa di un bit critico sconosciuto\n"
+
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"ATTENZIONE: Impossibile espandere i %% nell'URL (troppo lunga). Usata "
+"inespansa.\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "ATTENZIONE: Impossibile espandere i %% nell'URL (troppo lunga). Usata inespansa.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr ""
+"ATTENZIONE: Impossibile espandere i %% nell'URL (troppo lunga). Usata "
+"inespansa.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "In modalit� -pgp2 puoi firmare solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
+msgstr ""
+"In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -3619,7 +3860,8 @@ msgstr "%s: creazione della tabella hash fallita: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
@@ -3696,7 +3938,8 @@ msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
 #: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
+msgstr ""
+"chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
 
 #: g10/trustdb.c:332
 #, c-format
@@ -3761,28 +4004,34 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "la chiave non � indicata come insicura - impossibile usarla con il RNG finto!\n"
+msgstr ""
+"la chiave non � indicata come insicura - impossibile usarla con il RNG "
+"finto!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
-msgstr "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
+"le firme!\n"
 
 #. do not overwrite
 #: g10/openfile.c:84
@@ -3834,7 +4083,8 @@ msgstr ""
 "file delle opzioni\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
@@ -3858,33 +4108,37 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "informazioni di fiducia del possessore cancellate\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
@@ -3906,7 +4160,8 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 "Per costruire il Web-Of-Trust, GnuPG ha bisogno di sapere quali chiavi sono\n"
-"definitivamente affidabili - di solito quelle per cui hai accesso alla chiave\n"
+"definitivamente affidabili - di solito quelle per cui hai accesso alla "
+"chiave\n"
 "segreta.\n"
 "Rispondi \"s�\" per impostare questa chiave come definitivamente affidabile\n"
 
@@ -3919,7 +4174,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
 
 #: g10/helptext.c:72
@@ -3931,7 +4187,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -3947,13 +4204,17 @@ msgstr ""
 "suggerito perch� verificare firme DSA � molto pi� veloce di quelle ElGamal.\n"
 "\n"
 "ElGamal � un algoritmo usabile per firmare e cifrare.\n"
-"OpenPGP distingue tra due versioni di questo algoritmo: una solo per firmare\n"
+"OpenPGP distingue tra due versioni di questo algoritmo: una solo per "
+"firmare\n"
 "e una per firmare e cifrare. In realt� � sempre lo stesso, ma per creare\n"
-"firme sicure per la cifratura occorre scegliere in un modo particolare alcuni\n"
-"parametri: questo programma lo fa ma non � richiesto che altre implementazioni\n"
+"firme sicure per la cifratura occorre scegliere in un modo particolare "
+"alcuni\n"
+"parametri: questo programma lo fa ma non � richiesto che altre "
+"implementazioni\n"
 "di OpenPGP capiscano la versione per firmare e cifrare.\n"
 "\n"
-"La prima chiave (primaria) deve sempre essere una chiave in grado di firmare;\n"
+"La prima chiave (primaria) deve sempre essere una chiave in grado di "
+"firmare;\n"
 "questo � il motivo per cui le chiavi ElGamal solo per cifrare non sono\n"
 "disponibili in questo men�."
 
@@ -3963,19 +4224,28 @@ msgid ""
 "because they are not supported by all programs and signatures created\n"
 "with them are quite large and very slow to verify."
 msgstr ""
-"Anche se queste chiavi sono definite da RFC2400 non sono suggerite perch� non\n"
+"Anche se queste chiavi sono definite da RFC2400 non sono suggerite perch� "
+"non\n"
 "sono gestite da tutti i programmi e le firme create sono grandi e lunghe da\n"
 "verificare."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -3987,19 +4257,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4013,36 +4283,46 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -4051,36 +4331,46 @@ msgstr ""
 "appartiene alla persona indicata nell'user ID. � utile agli altri sapere\n"
 "con quanta attenzione lo hai verificato.\n"
 "\n"
-"\"0\" significa che non fai particolari affermazioni sull'attenzione con cui\n"
+"\"0\" significa che non fai particolari affermazioni sull'attenzione con "
+"cui\n"
 "    hai ferificato la chiave.\n"
 "\n"
-"\"1\" significa che credi che la chiave sia posseduta dalla persona che dice di\n"
-"    possederla, ma non hai o non hai potuto verificare per niente la chiave.\n"
+"\"1\" significa che credi che la chiave sia posseduta dalla persona che dice "
+"di\n"
+"    possederla, ma non hai o non hai potuto verificare per niente la "
+"chiave.\n"
 "\n"
-"\"2\" significa che hai fatto una verifica superficiale della chiave. Per esempio\n"
-"    potrebbe significare che hai verificato l'impronta digitale e confrontato\n"
+"\"2\" significa che hai fatto una verifica superficiale della chiave. Per "
+"esempio\n"
+"    potrebbe significare che hai verificato l'impronta digitale e "
+"confrontato\n"
 "    l'user ID della chiave con un documento di identit� con fotografia.\n"
 "\n"
-"\"3\" significa che hai fatto una verifica approfondita della chiave. Per esempio\n"
-"    potrebbe significare che hai verificato di persona l'impronta digitale con\n"
+"\"3\" significa che hai fatto una verifica approfondita della chiave. Per "
+"esempio\n"
+"    potrebbe significare che hai verificato di persona l'impronta digitale "
+"con\n"
 "    il possessore della chiave e hai controllato, per esempio per mezzo di\n"
 "    un documento di identit� con fotografia difficile da falsificare (come\n"
 "    un passaporto), che il nome del proprietario della chiave corrisponde a\n"
 "    quello nell'user ID della chiave, e per finire che hai verificato\n"
-"    (scambiando dei messaggi) che l'indirizzo di email sulla chiave appartiene\n"
+"    (scambiando dei messaggi) che l'indirizzo di email sulla chiave "
+"appartiene\n"
 "    al proprietario.\n"
 "\n"
-"Nota che gli esempi indicati per i livelli 2 e 3 sono *solo* esempi. Alla fine\n"
-"sta a te decidere cosa significano \"superficiale\" e \"approfondita\" quando\n"
+"Nota che gli esempi indicati per i livelli 2 e 3 sono *solo* esempi. Alla "
+"fine\n"
+"sta a te decidere cosa significano \"superficiale\" e \"approfondita\" "
+"quando\n"
 "firmi chiavi di altri.\n"
 "\n"
 "Se non sai cosa rispondere, rispondi \"0\"."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4088,39 +4378,42 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"Questa � una firma valida per la chiave. Normalmente non vorresti cancellare\n"
+"Questa � una firma valida per la chiave. Normalmente non vorresti "
+"cancellare\n"
 "questa firma perch� pu� essere importante per stabilire una connessione di\n"
 "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Questa firma non pu� essere verificata perch� non hai la chiave corrispondente.\n"
-"Dovresti rimandare la sua cancellazione finch� non saprai quale chiave � stata\n"
+"Questa firma non pu� essere verificata perch� non hai la chiave "
+"corrispondente.\n"
+"Dovresti rimandare la sua cancellazione finch� non saprai quale chiave � "
+"stata\n"
 "usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
 "attraverso una chiave gi� certificata."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "La firma non � valida. Ha senso rimuoverla dal tuo portachiavi."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4129,37 +4422,40 @@ msgid ""
 "a second one is available."
 msgstr ""
 "Questa � una firma che collega l'user id alla chiave. Solitamente non � una\n"
-"buona idea rimuovere questo tipo di firma. In realt� GnuPG potrebbe non essere\n"
-"pi� in grado di usare questa chiave. Quindi fallo solo se questa autofirma non\n"
+"buona idea rimuovere questo tipo di firma. In realt� GnuPG potrebbe non "
+"essere\n"
+"pi� in grado di usare questa chiave. Quindi fallo solo se questa autofirma "
+"non\n"
 "� valida per qualche ragione e ne � disponibile un'altra."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"Cambia le preferenze di tutti gli user ID (o solo di quelli selezionati) con\n"
+"Cambia le preferenze di tutti gli user ID (o solo di quelli selezionati) "
+"con\n"
 "la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
 "sar� aumentato di un secondo.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "Inserisci il nome del file a cui si riferisce la firma."
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4167,7 +4463,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4185,7 +4481,8 @@ msgstr ""
 "Dovresti specificare un motivo per questa certificazione. A seconda del\n"
 "contesto hai la possibilit� di scegliere tra questa lista:\n"
 "  \"Key has been compromised\"\n"
-"      Usa questo se hai un motivo per credere che una persona non autorizzata\n"
+"      Usa questo se hai un motivo per credere che una persona non "
+"autorizzata\n"
 "      abbia avuto accesso alla tua chiave segreta.\n"
 "  \"Key is superseded\"\n"
 "      Usa questo se hai sostituito questa chiave con una pi� recente.\n"
@@ -4195,7 +4492,7 @@ msgstr ""
 "      Usa questo per affermare che l'user ID non dovrebbe pi� essere usato;\n"
 "      solitamente � usato per indicare un indirizzo di email non valido.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4205,11 +4502,11 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
@@ -4271,3 +4568,31 @@ msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOME=VALORE|usa questi dati per una nota"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr ""
+#~ "il primo carattere del nome di una nota deve essere una lettera o un\n"
+#~ "underscore\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "ATTENZIONE: Questa chiave ha gi� un ID fotografico.\n"
+#~ "            Aggiungerne un altro pu� confondere alcune versioni di PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "� possibile avere un solo ID fotografico su ogni chiave.\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Impronta digitale:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "       Impronta digitale:"
diff --git a/po/ja.po b/po/ja.po
index d82181a06..e18ec9103 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-05-10 07:28-0400\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "�ٹ�: ��Ф����꡼����Ѥ��Ƥ��ޤ�!\n"
 
 #: util/secmem.c:89
@@ -48,7 +49,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
@@ -275,58 +276,59 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s'�������ޤ���: %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s'��Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' �����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s'���ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s'���Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s'�˽񤱤ޤ���: %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s'���Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ��Ф���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -340,7 +342,7 @@ msgstr ""
 "���Υץ����������������ǡ�������ڻ��Ѥ��ƤϤ����ޤ���!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +353,7 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -359,165 +361,165 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[�ե����뷲]|�ե����뷲������"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "�˴��Ǥ��ʤ��褦���˽�̾"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "�˴������������"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -527,238 +529,234 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ����ԤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "����μ����Ԥ˴���θ������"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "v3��̾�������ʤ�"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "����Ū��v4��̾"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "v4��̾�������ʤ�"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "gpg����������Ȥ����"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "�����θ������븰�ؤ�ɽ��"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr ""
 "|�ե�����|���ơ����������ե������\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|��ID|���θ�����Ū�˿��Ѥ���"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "�ѥ��åȤȰŹ������Υ��ץ���\n"
 "�������PGP 2.x��������"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "�ե���ID��ɽ�����ʤ�"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "�ե���ID��������륳�ޥ�ɹ�\n"
 "������"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|̾��=��|��������ǡ��������"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -767,7 +765,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -787,15 +785,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -805,7 +803,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -813,258 +811,295 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "�������С���URI�������ǽ\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "exec-path��%s��������ǽ\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "̵���������Ǥ�"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "���ؤ�̵���Ǥ�"
+
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "\"--keyserver-options %s\"������˻ȤäƤ�������\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥ�IDEA�Ź椬�׵ᤵ��ޤ� \n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "���Υ�å�������PGP 2.x�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "̵����ͥ����\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "̵����ͥ����\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
 msgstr "̵����ͥ����\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "̵����ͥ����\n"
+
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �桼����id"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �桼����id"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1134,7 +1169,8 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "��������� quoted printable ʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA����Ѥ����ΤǤ��礦\n"
@@ -1160,11 +1196,13 @@ msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "�˴���ͳ: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Ŭ��: "
 
 #. a string with valid answers
@@ -1266,7 +1304,8 @@ msgstr "��%08lX: ���ϴ����ڤ�Ǥ�\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
 msgstr "%08lX: ���θ����ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
 #: g10/pkclist.c:448
@@ -1332,7 +1371,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
 #: g10/pkclist.c:600
@@ -1344,28 +1384,29 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1373,120 +1414,130 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ����ԤȤ�������ѤߤǤ�\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "�����å�: ������������ѤߤǤ�\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "����μ�����`%s'�����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "����%c%lu�ν�ʣ\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "¿������`%c'����\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA��ElGamal (����)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "�ɤ�ˤ��ޤ���? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "���Υ��르�ꥺ���ȿ�Ф���Ƥ��ޤ� - ����Ǥ���ޤ���? "
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1499,19 +1550,19 @@ msgstr ""
 "             ����θ�Ĺ�� 1024 �ӥå�\n"
 "         ����ο侩��Ĺ�� 2048 �ӥå�\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 
@@ -1523,12 +1574,12 @@ msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1536,27 +1587,29 @@ msgstr ""
 "2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
 "�侩���ޤ���!\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
 msgstr ""
 "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
 "����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1572,7 +1625,7 @@ msgstr ""
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1588,30 +1641,30 @@ msgstr ""
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s��%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1619,14 +1672,15 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "����Ǥ����Ǥ��� (y/n)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -1638,44 +1692,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1686,27 +1740,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1714,16 +1768,16 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1735,7 +1789,7 @@ msgstr ""
 "�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1746,53 +1800,53 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s'����̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "��������`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1800,97 +1854,111 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "�����˺��ޤ���? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s'�ϴ��˰��̺ѤߤǤ�\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: �����ޤ���: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'�����ɤ߹��ߤޤ�\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
+
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s�Ź沽 ������: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "��`%s'�����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɹ��ߥ��顼: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
@@ -1900,271 +1968,282 @@ msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "         ��������: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " �����åפ�����������: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "               �ɹ���: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     �������桼����ID: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ����������: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           ��������̾: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       �����������˴�: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "       ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "��%08lX: �桼����ID������ޤ���\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "��%08lX: �����б���������������ޤ���\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s'�ؤν�Ф�\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "��%08lX: �������桼����ID��1��\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "��%08lX: �������桼����ID��%d��\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "��%08lX: ��������̾��1��\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "��%08lX: ��������̾��%d��\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "��%08lX: ������������1��\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "��%08lX: ������������%d��\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "��%08lX: �ѹ��ʤ�\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "��%08lX: �桼����id \"%s\" �Υ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
+msgstr ""
+"��%08lX: �桼����id \"%s\" �Υ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "��%08lX: �����б���������������ޤ���\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "��%08lX: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "��%08lX: �����åפ����桼����ID '"
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "��%08lX: �����åפ�������\n"
@@ -2173,106 +2252,130 @@ msgstr "��%08lX: �����åפ�������\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX�ΰ����Ф�\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX���Ժߡ�\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "��%08lX: �˴���������ɲ�\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[�˴�]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "̵���ʽ�̾1��\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵���ʽ�̾%d��\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID \"%s\" ���˴�����Ƥ��ޤ���"
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
+"������̾�Ǥ���\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2281,81 +2384,109 @@ msgstr ""
 "\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
 "������̾�Ǥ���\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "���θ��ϴ����ڤ�Ǥ�!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ����\"0\"�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��������ǧ���Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �������ǧ���ޤ�����%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƴ�ǧ���ޤ�����%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2363,7 +2494,7 @@ msgstr ""
 "\n"
 "��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2371,7 +2502,7 @@ msgstr ""
 "\n"
 "��̾���˴��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2379,7 +2510,7 @@ msgstr ""
 "\n"
 "���θ�����������ǧ���Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2387,7 +2518,7 @@ msgstr ""
 "\n"
 "���θ��ϰ������ǧ���ޤ�����\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2395,33 +2526,33 @@ msgstr ""
 "\n"
 "���θ��ϡ����ʤ����դ��Ƴ�ǧ���ޤ�����\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2429,7 +2560,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2438,553 +2569,578 @@ msgstr ""
 "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "���Υإ�פ򸫤�"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "����򸫤�"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "����N������"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "�˴��Ǥ��ʤ��褦���ؽ�̾"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "�������ɲ�"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������ΰ��������ؤ�"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "�������������"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "�����ΰ����򹹿�"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "��̾���˴�"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "�������˴�"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "��̩���֥��å�`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "�����˴�����Ƥ��ޤ���"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "���򤷤������������˴����ޤ���? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "���θ����������˴����ޤ���? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "�����������˹������ޤ���? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
 msgstr "���θ���%s��%s%s�ˤ�ä��˴����줿�褦�Ǥ�\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (�ǥꥱ����)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �������˴��ѤߤǤ�: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- �Ǥä��������˴���ȯ��\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �˴���ǧ�㳲: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
 
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"�ٹ�: ���θ��ˤϤ⤦�ե���ID������ޤ���\n"
-"      �㤦�ե���ID���ɲä���ȡ��������Ǥ�PGP�Ϻ��𤹤뤫�⤷��ޤ���\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "1�ܤθ��ˤϥե���ID��ҤȤ��դ���������Ǥ���\n"
-
-#: g10/keyedit.c:1686
-msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
+
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "����Ĺ�������Ϥ��Ƥ�������"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -2993,7 +3149,7 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -3002,234 +3158,251 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ��˴��������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX��%s���˴�����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX��%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�˴�������������˺��ޤ���? (y/N) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "��̾�ݥꥷ��: "
+
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "��̾�ݥꥷ��: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "��̾����: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "����"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "����:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "���Ȼ���ΰ���"
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "                    ����:"
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "                ���� ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "                ���� ="
+
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "                ���� ="
+
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "                ���� ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽���줿�ǡ���\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "��������%08lX�Ǥ�\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ǰŹ沽���줿�ǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽���줿�ǡ�������\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "����: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "�ݥꥷ��: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "�����ڤ�ν�̾: \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "       ��̾ \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -3248,30 +3421,46 @@ msgstr ""
 "���ΰŹ楢�르�ꥺ���ȿ�Ф���Ƥ��ޤ���\n"
 "��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ���ͭ��\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ�����\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "\"--keyserver-options %s\"������˻ȤäƤ�������\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -3301,7 +3490,7 @@ msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
@@ -3414,66 +3603,74 @@ msgstr "��̾���줿�ǡ���������ޤ���\n"
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "ƿ̾�μ������ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��ƿ̾�μ������ѤǤ���\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK�ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ݸ�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "��%08lX: �����˴��ѤߤǤ�!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "��%08lX��HKP�������С�%s���׵�\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "`%s'�ؤ��������顼: %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "`%s'�ؤ����������� (����=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "\"%s\"��HKP�����С�%s���鸡��\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
@@ -3504,69 +3701,82 @@ msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "ȿ�Ф��줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�����PGP����������ElGamal���Ǥ���\n"
 "��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "����: ��̾��%08lX�ϴ����ڤ�Ǥ�%s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
+
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ��ڤ˼���: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s��̾����̾��: %s\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǽ�̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s������Ǥ��ޤ���: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -3650,7 +3860,8 @@ msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
@@ -3707,7 +3918,8 @@ msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
 #: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
+msgstr ""
+"���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
 
 #: g10/trustdb.c:200
 #, c-format
@@ -3792,29 +4004,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "��Ф��Ƥ⤤���ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s'�򥹥��å�: ��ʣ\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s'�򥹥��å�: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
 msgstr ""
 "`%s'�򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
 "��̾���Ѥ���ˤϡ������ǤϤ���ޤ���!\n"
@@ -3867,7 +4081,8 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "���ץ���󡦥ե�������ɤ�ľ���褦��GnuPG��Ƶ�ư���Ƥ�������\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
 #: g10/encr-data.c:98
@@ -3887,33 +4102,37 @@ msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "���θ����ؤ��������ޤ���? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "���θ������ˤ���������̩�� \"%s\" ������ޤ�!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ץ��ץ����Ǥ���������Ƥ���������\n"
 
@@ -3948,7 +4167,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�פ������Ƥ���������"
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "��å�������������ꥢ�ɥ쥹�Υ桼����ID�����Ϥ��Ƥ���������"
 
 #: g10/helptext.c:72
@@ -3960,7 +4180,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -3996,15 +4217,23 @@ msgstr ""
 "�ʤ��ʤ顢�����򥵥ݡ��Ȥ��Ƥ��ʤ��ץ�����ब���ꡢ\n"
 "����������̾������Ĺ���ơ����ڤˤ���֤������뤿��Ǥ���"
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "����Ĺ�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "��yes�פ���no�פ������Ƥ�������"
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4016,19 +4245,19 @@ msgstr ""
 "ɽ������ʤ��Ǥ��礦��������ꡢ�����ƥ�������ͤ���֤��Ѵ�����\n"
 "�褦�˻�ߤޤ���"
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "���ۥ����̾�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
 msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4042,36 +4271,46 @@ msgstr ""
 "O  ����������³�ԡ�\n"
 "Q  ������������ߡ�"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "���������������硢��yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -4105,11 +4344,11 @@ msgstr ""
 "\n"
 "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�פ������Ƥ�������"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4117,11 +4356,11 @@ msgstr ""
 "�����Υ桼����ID�������˺����������С���yes�פ������Ƥ���������\n"
 "�����������Ʊ���˺�����ޤ�!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "�����������������硢��yes�פ������Ƥ�������"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4131,7 +4370,7 @@ msgstr ""
 "�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
 "���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4143,7 +4382,7 @@ msgstr ""
 "�ʤ��ʤ顢���ν�̾�θ��ϡ�¾�ξ������줿���ǿ��Ѥ��ؤ�������뤫��\n"
 "����ʤ�����Ǥ���"
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4151,7 +4390,7 @@ msgstr ""
 "���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
 "�Ȥ�����̣�Ǥ���"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4164,7 +4403,7 @@ msgstr ""
 "����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��̵���Ǥ��äơ�\n"
 "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4173,23 +4412,23 @@ msgstr ""
 "���� (�ޤ������򤷤�) �桼����ID�������򡢸��ߤ������������ѹ�\n"
 "���ޤ����ط����뼫�ʽ�̾�Υ����ॹ����פϡ�1�ä����ߤޤ���\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��񤭤��Ƥ褱��С���yes�פ������Ƥ�������"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4197,7 +4436,7 @@ msgstr ""
 "�������ե�����̾�����Ϥ��Ƥ���������ñ�˥꥿���󡦥����򲡤��ȡ�\n"
 "(��̤ǰϤ��) ����Υե�����̾����Ѥ��ޤ���"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4226,7 +4465,7 @@ msgstr ""
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4236,11 +4475,11 @@ msgstr ""
 "�����Ȥ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ƥ����Ȥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s'�Υإ�פϤ���ޤ���"
@@ -4302,3 +4541,29 @@ msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|̾��=��|��������ǡ��������"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "�ٹ�: ���θ��ˤϤ⤦�ե���ID������ޤ���\n"
+#~ "      �㤦�ե���ID���ɲä���ȡ��������Ǥ�PGP�Ϻ��𤹤뤫�⤷��ޤ���\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "1�ܤθ��ˤϥե���ID��ҤȤ��դ���������Ǥ���\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "����:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "                    ����:"
diff --git a/po/nl.po b/po/nl.po
index 1f4d6e7bd..58b4ba039 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -274,59 +274,59 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/pl.po b/po/pl.po
index 3cf393410..14d948f94 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.6\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-04-28 02:44+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -283,62 +283,62 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo�na sprawdzi� %s: %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ostrze�enie: plik random_seed ma niew�a�ciwy rozmiar - nie zostanie u�yty\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo�na odczyta� %s: %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na stworzy� %s: %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo�na zapisa� %s: %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� %s: %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/pt.po b/po/pt.po
index 292c8e8b7..a8b994c19 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-03-05 16:05+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -276,60 +276,60 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed est� vazia\n"
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "aviso: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel ler `%s': %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel escrever `%s': %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 19f2b5ed4..24af7e8a0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -283,59 +283,59 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/sv.po b/po/sv.po
index 80ab4ef88..1c38c1a89 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2001-08-23 10:32+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -287,59 +287,59 @@ msgstr "... detta �r ett fel i programmet (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: cipher/random.c:349 g10/import.c:193 g10/keygen.c:1809
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
 
-#: cipher/random.c:353
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status p� \"%s\": %s\n"
 
-#: cipher/random.c:358
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" �r inte �n vanlig fil - ignorerad\n"
 
-#: cipher/random.c:363
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed �r tom\n"
 
-#: cipher/random.c:369
+#: cipher/random.c:372
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varning: random_seed har en felaktig storlek och anv�nds d�rf�r inte\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte l�sa \"%s\": %s\n"
 
-#: cipher/random.c:415
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:435
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:442
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:445
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte st�nga \"%s\": %s\n"
 
-#: cipher/random.c:691
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: anv�nder en os�ker slumptalsgenerator!!\n"
 
-#: cipher/random.c:692
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/tr.po b/po/tr.po
index 1b31b8e4c..247299e88 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
 "PO-Revision-Date: 2002-05-10 15:58+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -15,12 +15,15 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Uyarı: kullanılan bellek güvenli değil!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine bakınız\n"
+msgstr ""
+"Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine "
+"bakınız\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -46,7 +49,7 @@ msgstr "hayır"
 msgid "nN"
 msgstr "hH"
 
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "çıkış"
 
@@ -273,58 +276,59 @@ msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:324
+#: cipher/random.c:356
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:361
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:366
 msgid "note: random_seed file is empty\n"
 msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "uyarı: \"random_seed\" dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:380
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:418
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:438
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:445
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:448
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:694
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:695
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,7 +342,7 @@ msgstr ""
 "BU PROGRAMLA ÜRETİLMİŞ HİÇBİR VERİYİ KULLANMAYIN!!\n"
 "\n"
 
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +354,7 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/g10.c:287
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +362,163 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:289
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:290
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:291
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:292
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/g10.c:293
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[dosyalar]|dosyalar şifrelenir"
 
-#: g10/g10.c:294
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/g10.c:295
+#: g10/g10.c:312
 msgid "store only"
 msgstr "sadece saklar"
 
-#: g10/g10.c:296
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:297
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[dosyalar]|dosyaların şifresi açılır"
 
-#: g10/g10.c:298
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:300
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:302
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:303
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:304
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:305
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:306
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:307
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:309
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:310
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:311
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:312
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "bir anahtarı iptal edilemez olarak imzalar"
 
-#: g10/g10.c:313
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar"
 
-#: g10/g10.c:314
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:315
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:316
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:317
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:318
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:320
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:322
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:326
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:328
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "sadece paketlerin silsilesini listeler"
 
-#: g10/g10.c:330
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "sahibiningüvencesi değerlerini gönderir"
 
-#: g10/g10.c:332
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "sahibiningüvencesi değerlerini indirir"
 
-#: g10/g10.c:334
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:336
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "bakımsız güvence veritabanının güncellemesi"
 
-#: g10/g10.c:337
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "bozulan güvence veritabanını onarır"
 
-#: g10/g10.c:338
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdinin zırhını kaldırır"
 
-#: g10/g10.c:340
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdiyi zırhlar"
 
-#: g10/g10.c:342
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:346
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,196 +528,194 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:350
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:353
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: g10/g10.c:355
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: g10/g10.c:361
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/g10.c:362
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/g10.c:364
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:371
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:372
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:373
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/g10.c:374
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: g10/g10.c:375
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: g10/g10.c:376
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "v3 imzalara zorlamaz"
 
-#: g10/g10.c:377
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "v4 imzalara zorlar"
 
-#: g10/g10.c:378
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "v4 imzalara zorlamaz"
 
-#: g10/g10.c:379
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: g10/g10.c:381
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "şifreleme için asla bir MDC kullanılmaz"
 
-#: g10/g10.c:383
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "gpg-agent kullan"
 
-#: g10/g10.c:388
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: g10/g10.c:389
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: g10/g10.c:390
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: g10/g10.c:391
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: g10/g10.c:392
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar zincirini listeye ekler"
 
-#: g10/g10.c:393
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/g10.c:394
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/g10.c:395
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: g10/g10.c:397
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: g10/g10.c:398
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "seçenekleri dosyadan okur"
 
-#: g10/g10.c:402
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/g10.c:404
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
 
-#: g10/g10.c:410
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ANHKİML|bu anahtar son derece güvenli"
 
-#: g10/g10.c:411
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: g10/g10.c:412
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 de açıklanan kipi uygular"
 
-#: g10/g10.c:413
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini OpenPGP tarzında ayarlar"
 
-#: g10/g10.c:414
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini PGP 2.x'e göre ayarlar"
 
-#: g10/g10.c:418
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|anahtar parolası kipi olarak N kullanılır"
 
-#: g10/g10.c:420
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|İSİM|anahtar parolaları için ileti özümleme algoritması olarak İSİM kullanılır"
+msgstr ""
+"|İSİM|anahtar parolaları için ileti özümleme algoritması olarak İSİM "
+"kullanılır"
 
-#: g10/g10.c:422
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|İSİM|anahtar parolaları için şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:424
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:425
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:426
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: g10/g10.c:427
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
 
-#: g10/g10.c:428
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Foto kimliklerini gösterir"
 
-#: g10/g10.c:429
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Foto kimliklerini göstermez"
 
-#: g10/g10.c:430
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
 
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|İSİM=DEĞER|veri bu nitelemeyle kullanılır"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -721,7 +723,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:437
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -741,15 +743,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:579
+#: g10/g10.c:620
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:583
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:586
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +761,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,256 +769,295 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:671
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:728
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:907
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:914
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:1214
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "geçersiz zırh"
 
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: dosya sürümü %d geçersiz\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "anahtar zinciri geçersiz"
+
+#: g10/g10.c:1369
 #, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "lütfen yerine \"--keyserver-options %s\" kullanınız\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:1351
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:1363
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:1395
+#: g10/g10.c:1555
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:1401
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:1414
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "bu ileti PGP 2.x tarafından kullanılamayabilir\n"
 
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "belirtilen imza güvence adresi geçersiz\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "belirtilen sertifika güvence adresi geçersiz\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1499
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n"
 
-#: g10/g10.c:1501
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:1503
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:1505
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:1508
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1512
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:1516
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı denetim seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "tercihler geçersiz\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "tercihler geçersiz\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
 msgstr "tercihler geçersiz\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "tercihler geçersiz\n"
+
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:1648
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:1665
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:1678
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:1692
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:1701
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:1719
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:1754
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: g10/g10.c:1833
+#: g10/g10.c:2015
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:1916
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:1924
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:2011
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2097
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "bir niteleme isminin ilk karakteri bir harf ya da altçizgi olmalı\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
-msgstr "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve sonuna bir '=' gelir.\n"
-
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "bir niteleme isminde noktalar diğer karakterler tarafından kuşatılmış olmalıdır\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
+"sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:2333
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "belirtilen sertifika güvence adresi geçersiz\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "belirtilen imza güvence adresi geçersiz\n"
+
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1086,8 +1127,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
 #: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta sunucusu kullanılmış\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
+"sunucusu kullanılmış\n"
 
 #: g10/pkclist.c:61
 msgid "No reason specified"
@@ -1110,11 +1154,13 @@ msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
 #: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
 msgstr "Yürürlükten kaldırma sebebi: "
 
 #: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
 msgstr "Yürürlükten kaldırma açıklaması: "
 
 #. a string with valid answers
@@ -1190,7 +1236,8 @@ msgstr "Kararınız? "
 
 #: g10/pkclist.c:313
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Bu anahtara gerçekten en yüksek güven derecesini vermek istiyor musunuz?"
+msgstr ""
+"Bu anahtara gerçekten en yüksek güven derecesini vermek istiyor musunuz?"
 
 #: g10/pkclist.c:325
 msgid "Certificates leading to an ultimately trusted key:\n"
@@ -1217,8 +1264,10 @@ msgstr "%08lX: anahtarın kullanım süresi dolmuş\n"
 
 #: g10/pkclist.c:442
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
 #: g10/pkclist.c:448
 #, c-format
@@ -1267,7 +1316,8 @@ msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
 #: g10/pkclist.c:569
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+msgstr ""
+"UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
 #: g10/pkclist.c:574
 msgid "Note: This key has been disabled.\n"
@@ -1282,7 +1332,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
 #: g10/pkclist.c:592
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
 #: g10/pkclist.c:600
@@ -1294,28 +1345,31 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
 #: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla sertifikalanmamış!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
+"sertifikalanmamış!\n"
 
 #: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1323,120 +1377,130 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
 
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/keygen.c:180
+#: g10/keygen.c:182
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "%c%lu tercihi geçersiz\n"
 
-#: g10/keygen.c:187
+#: g10/keygen.c:189
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "%c%lu tercihi yinelendi\n"
 
-#: g10/keygen.c:192
+#: g10/keygen.c:194
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "`%c' tercih çok fazla\n"
 
-#: g10/keygen.c:257
+#: g10/keygen.c:264
 msgid "invalid character in preference string\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "öz-imza yazılıyor\n"
+
+#: g10/keygen.c:563
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:607
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:777
+#: g10/keygen.c:941
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:779
+#: g10/keygen.c:943
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:780
+#: g10/keygen.c:944
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:782
+#: g10/keygen.c:946
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:783
+#: g10/keygen.c:948
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
 
-#: g10/keygen.c:784
+#: g10/keygen.c:949
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:951
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Bu algoritmanın kullanımı uygun değil - Yine de oluşturulsun mu?"
 
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1449,19 +1513,20 @@ msgstr ""
 "                  öntanımlı anahtar uzunluğu: 1024 bit\n"
 "    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
 
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
 msgid "What keysize do you want? (1024) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
 
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
+msgstr ""
+"anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
 
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
 
@@ -1473,12 +1538,12 @@ msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit't
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
 
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1486,25 +1551,29 @@ msgstr ""
 "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
 "2048 bitten fazlası tavsiye edilmez.\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
 msgid "Are you sure that you want this keysize? "
 msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
 
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
-msgstr "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından kendinizi uzak tutun! (ne demekse...)\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
+"kendinizi uzak tutun! (ne demekse...)\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1520,7 +1589,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1536,30 +1605,30 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
 msgid "Signature is valid for? (0) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s hep geçerli olacak\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s %s sonra geçersiz olacak\n"
 
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1567,14 +1636,15 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
 msgid "Is this correct (y/n)? "
 msgstr "Bu doğru mu? (e/h)? "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
 msgid ""
 "\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
 "from Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -1586,44 +1656,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1634,27 +1704,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
+msgstr ""
+"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
+msgstr ""
+"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1662,16 +1734,18 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
 msgid "passphrase not correctly repeated; try again"
-msgstr "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem tekrarlanacak"
+msgstr ""
+"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
+"tekrarlanacak"
 
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
 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"
@@ -1683,7 +1757,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
 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"
@@ -1691,57 +1765,58 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Bir miktar rasgele bayt üretilmesi gerekiyor. İlk üretim sırasında biraz\n"
-"hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden yararlanmak)\n"
+"hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden "
+"yararlanmak)\n"
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
 msgid "key marked as ultimately trusted.\n"
 msgstr "anahtar son derece güvenli olarak imlendi.\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1749,97 +1824,117 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için ikinci bir anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
+"problemi)\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
+msgstr ""
+"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
 msgid "Really create? "
 msgstr "Gerçekten oluşturulsun mu? "
 
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: açılamıyor: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: UYARI: dosya boş\n"
 
-#: g10/encode.c:285
+#: g10/encode.c:346
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme yapabilirsiniz\n"
+msgstr ""
+"--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
+"yapabilirsiniz\n"
 
-#: g10/encode.c:313
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
-#: g10/encode.c:563
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
+
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s %s için şifrelendi\n"
 
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/export.c:169
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "%08lX anahtarı: bir RFC2440 anahtarı değil - atlandı\n"
 
-#: g10/export.c:180
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:188
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:255
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
@@ -1849,271 +1944,288 @@ msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
 msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
+msgstr ""
+"Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli "
+"oldu\n"
 
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
 
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "şu ana kadar herşey yolunda giderek %lu anahtar işlenmiş\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                   indirildi: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
+
+#: g10/import.c:641 g10/import.c:875
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliği '%s' kabul edildi\n"
 
-#: g10/import.c:462
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
 
-#: g10/import.c:464
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:479
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 
-#: g10/import.c:489
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "anahtar %08lX: genel anahtar indirildi\n"
 
-#: g10/import.c:524
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "anahtar %08lX: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "anahtar %08lX: 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "anahtar %08lX: %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "anahtar %08lX: 1 yeni imza\n"
 
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "anahtar %08lX: %d yeni imza\n"
 
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "anahtar %08lX: bir yeni yardımcı anahtar\n"
 
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "anahtar %08lX: %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
 msgstr "anahtar %08lX: değişmedi\n"
 
-#: g10/import.c:671
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
 #. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:691
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 
-#: g10/import.c:720
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası uygulanamaz\n"
+msgstr ""
+"anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası "
+"uygulanamaz\n"
 
-#: g10/import.c:760
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası indirildi\n"
 
-#: g10/import.c:826
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "anahtar %08lX: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:839
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için desteklenmiyor\n"
+msgstr ""
+"anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
+"desteklenmiyor\n"
 
-#: g10/import.c:841
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:858
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:868
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:869
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:899
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
 
-#: g10/import.c:922
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
@@ -2122,106 +2234,138 @@ msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n"
 
-#: g10/import.c:954
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:971
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
+
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1072
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "anahtar %08lX: çift kullanıcı kimliği saptandı - katıştırıldı\n"
 
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "Uyarı: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma anahtarı %08lX alınıyor\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgstr ""
+"Uyarı: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
+"anahtarı %08lX alınıyor\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "Uyarı: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma anahtarı %08lX mevcut değil.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgstr ""
+"Uyarı: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
+"anahtarı %08lX mevcut değil.\n"
 
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1231
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
 
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "UYARI: \"%s\" dosyası boş\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"\"%s\" üzerindeki imzanız\n"
+"dahili bir imza.\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2230,75 +2374,81 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
+msgstr ""
+"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası uygulanamayabilir.\n"
+#: g10/keyedit.c:532
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
+"uygulanamayabilir.\n"
 
-#: g10/keyedit.c:479
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2306,7 +2456,32 @@ msgstr ""
 "Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"İmza dışarı gönderilemez olarak imlenecek.\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
+
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2314,7 +2489,7 @@ msgstr ""
 "\n"
 "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2322,7 +2497,7 @@ msgstr ""
 "\n"
 "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2330,7 +2505,7 @@ msgstr ""
 "\n"
 "Her şeyiyle bu anahtarı kontol edemedim.\n"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2338,7 +2513,7 @@ msgstr ""
 "\n"
 "Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2346,33 +2521,33 @@ msgstr ""
 "\n"
 "Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Gerçekten imzalayacak mısınız? "
 
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2380,7 +2555,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2388,553 +2563,581 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "k"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "kaydet"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "yardım"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "piz"
 
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "parmak izini göster"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "listele"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini göster"
 
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "kullkim"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "anahtar"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "N yardımcı anahtarını seçer"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "kontrol"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "imzaları listele"
 
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "imzala"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "yimza"
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "yksızimza"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "yürürlükten kaldırılamayan imza"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "içyksızimza"
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "yürürlükten kaldırılamayan yerel imza"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "hata ayıklama"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "kullkimEkle"
 
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "fotoekle"
 
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "kullkimSil"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "fotosil"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "anhEkle"
 
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "anhSil"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "anhEkle"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "bir yardımcı anahtar ekler"
+
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "imzaSil"
 
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "imzaları siler"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "sontarih"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "asıl"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "seçmece"
 
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "önayar"
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "tercihgöst"
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "tercihyap"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "tercgüncel"
 
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "güncelenmiş tercihler"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "aparola"
 
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "güvence"
 
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "imzayürkal"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "yürkalanh"
 
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "iptal"
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "kullan"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "fotogöst"
 
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
 msgid "can't do that in batchmode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "gizli anahtar bloğu `%s' okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor musunuz? "
+msgstr ""
+"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
+"musunuz? "
 
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Değişiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
-msgstr "Bu anahtar %s tarafından %s%s anahtarı ile yürürlükten kaldırılmış olabilir\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
+msgstr ""
+"Bu anahtar %s tarafından %s%s anahtarı ile yürürlükten kaldırılmış olabilir\n"
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  üretildi: %s son kullanma tarihi: %s"
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " güven derecesi: %c/%c"
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
 
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
 
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+#, fuzzy
 msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, geçerliliğinin\n"
 "olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:1660
-msgid ""
-"WARNING: This key already has a photo ID.\n"
-"         Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"UYARI: Bu anahtarın zaten bir foto kimliği var.\n"
-"    Başka bir foto kimliği eklemek PGP'in bazı sürümleriyle uyumsuz olabilir.\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "Bir anahtarın sadece bir foto kimliği olabilir.\n"
-
-#: g10/keyedit.c:1686
+#: g10/keyedit.c:1930
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
+
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Anahtar uzunluğunu giriniz"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
+
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -2943,7 +3146,7 @@ msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -2952,236 +3155,259 @@ msgstr ""
 "\"\n"
 "%08lX anahtarınızla %s de yerel olarak imzalı\n"
 
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
+msgstr ""
+"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
+msgstr ""
+"Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Anahtar 0x%3$08lX (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği gösteriliyor\n"
+msgstr ""
+"Anahtar 0x%3$08lX (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
+"gösteriliyor\n"
+
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "imza guvencesi: "
 
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
 
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "imza niteleyici: "
+
+#: g10/keylist.c:129
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:127
+#: g10/keylist.c:136
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/keylist.c:216
+#: g10/keylist.c:225
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
 #. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr " Parmak izi:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "anahtarları ve parmak izlerini listeler"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     Anahtar parmak izi ="
 
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid "             Fingerprint:"
-msgstr "              Parmak izi:"
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     Anahtar parmak izi ="
 
-#: g10/keylist.c:899
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     Anahtar parmak izi ="
+
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "genel anahtar: %08lX\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve kullanıcı kimliği\n"
 "%08lX ile şifrelendi, %s oluşturuldu\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s anahtarı ve %08lX kullanıcı kimliği ile şifrelendi\n"
 
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
+msgstr ""
+"IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
+msgstr ""
+"tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Niteleme: "
 
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Güvence: "
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s imzası, %s anahtarı ve %08lX kullanıcı kimliği ile yapıldı\n"
 
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "KÖTÜ imza: \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Kullanım tarihi geçmiş imza: \""
 
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Doğru imza: \""
 
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                den \""
 
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -3196,34 +3422,52 @@ msgstr "Deneysel algoritmalar kullanılmamalı!\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
+msgstr ""
+"bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
 
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Uyarı: %s \"%s\" de güvensiz sahiplik\n"
 
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Uyarı: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/misc.c:435
+#: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:444
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
-"Daha fazla bilgi için lütfen http://www.gnupg.org/why-not-idea.html adresine\n"
+"Daha fazla bilgi için lütfen http://www.gnupg.org/why-not-idea.html "
+"adresine\n"
 "bakınız.\n"
 
-#: g10/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "lütfen yerine \"--keyserver-options %s\" kullanınız\n"
+
+#: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -3253,7 +3497,7 @@ msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
@@ -3364,66 +3608,74 @@ msgstr "imzalı veri yok\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonim alıcı: %08lX gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
 
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "BİLGİ: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "anahtar %08lX: anahtar yürürlükten kaldırılmıştı!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
 msgstr "%08lX anahtarı HKP anahtar sunucusunun %s adresinden isteniyor\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "anahtar sunucusunun %s adresinden anahtar alınamadı\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "\"%s\" adresine gönderme hatası: %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "\"%s\" adresine gönderme işlemi başarılı (durum=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "\"%s\" adresine gönderme işlemi başarısız (durum=%u)\n"
 
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/hkp.c:521
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "anahtar sunucusu aranamıyor: %s\n"
@@ -3448,75 +3700,95 @@ msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar değiştirin.\n"
+msgstr ""
+"UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
+"değiştirin.\n"
 
 #: g10/seckey-cert.c:311
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı üretiliyor\n"
+msgstr ""
+"gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı "
+"üretiliyor\n"
 
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "genel anahtar imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "genel anahtar imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "BİLGİ: %08lX imza anahtarının kullanım süresi %s tarihinde dolmuş\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "Hatalı imzanın bilinmeyen bir kritik bitten kaynaklandığı sanılıyor\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
+"Uzatılmadan kullanılıyor.\n"
+
+#: g10/sign.c:151
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 "UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:274
+#: g10/sign.c:303
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:283
+#: g10/sign.c:312
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s imza: %s den\n"
 
-#: g10/sign.c:430
+#: g10/sign.c:461
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imzalama yapabilirsiniz\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imzalama yapabilirsiniz\n"
 
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
+
+#: g10/sign.c:784
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:796
+#: g10/sign.c:876
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imza yapabilirsiniz\n"
 
-#: g10/sign.c:953
+#: g10/sign.c:1029
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -3600,7 +3872,8 @@ msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
@@ -3657,7 +3930,8 @@ msgstr "%s: kayıt ekleme başarısız: %s\n"
 
 #: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
+msgstr ""
+"güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
 #: g10/trustdb.c:200
 #, c-format
@@ -3725,7 +3999,9 @@ msgstr "son derece güvenli %08lX genel anahtarı yok\n"
 #: g10/trustdb.c:1593
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "denetim %d derinlikte yapılıyor: signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"denetim %d derinlikte yapılıyor: signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+"d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3742,27 +4018,29 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:138
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:149
+#: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:160
+#: g10/skclist.c:179
 #, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
 msgstr ""
 "`%s' atlandı:\n"
 "Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
@@ -3812,10 +4090,12 @@ msgstr "%s: dizin oluşturuldu\n"
 
 #: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "Yeni seçenekler dosyasının okunabilmesi için GnuPG yeniden başlatılmalıdır\n"
+msgstr ""
+"Yeni seçenekler dosyasının okunabilmesi için GnuPG yeniden başlatılmalıdır\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
 #: g10/encr-data.c:98
@@ -3829,39 +4109,45 @@ msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere denendi!\n"
+msgstr ""
+"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
+"denendi!\n"
 
 #: g10/seskey.c:200
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "önceden belirlenmiş işlemler kipinde \"--yes\" olmaksızın yapılamaz\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Bu anahtar, anahtar zincirinden silinsin mi? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "sahibinin güvencesi bilgisi temizlendi\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
@@ -3884,7 +4170,8 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 "Web-of-Trust oluşturulabilmesi için GnuPG'ye hangi anahtarların son derece\n"
-"güvenli (bunlar gizli anahtarlarına erişiminiz olan anahtarlardır) olduğunun\n"
+"güvenli (bunlar gizli anahtarlarına erişiminiz olan anahtarlardır) "
+"olduğunun\n"
 "bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
 "olduğunun belirtilmesi için yeterlidir.\n"
 
@@ -3901,7 +4188,8 @@ msgstr ""
 " \"evet\" yazın."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
 
 #: g10/helptext.c:72
@@ -3913,7 +4201,8 @@ msgid ""
 "DSA signatures are much faster than those of ElGamal.\n"
 "\n"
 "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
 "and a sign+encrypt; actually it is the same, but some parameters must be\n"
 "selected in a special way to create a safe key for signatures: this program\n"
 "does this but other OpenPGP implementations are not required to understand\n"
@@ -3931,7 +4220,8 @@ msgstr ""
 "\n"
 "ElGamal imzalar ve şifreleme için kullanılan bir algoritmadır.\n"
 "OpenPGP bu algoritmanın bu iki kullanımını birbirinden ayırır:\n"
-"sadece şifreleme ve imza+şifreleme; esas olarak aynı gibi görünmekle beraber\n"
+"sadece şifreleme ve imza+şifreleme; esas olarak aynı gibi görünmekle "
+"beraber\n"
 "imzalar için kullanılacak anahtarı oluşturacak bazı özel parametrelerin\n"
 "seçilmesini gerektirir: bu program bunu yapar ama diğer OpenPGP\n"
 "gerçeklemelerinin imza+şifreleme olayını anlaması gerekmiyorsa kullanmak\n"
@@ -3952,15 +4242,23 @@ msgstr ""
 "olduğundan RFC2440 standardında tanımlı olmalarına rağmen tavsiye\n"
 "edilmezler."
 
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
 msgid "Enter the size of the key"
 msgstr "Anahtar uzunluğunu giriniz"
 
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
 msgid "Answer \"yes\" or \"no\""
 msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:113
+#: g10/helptext.c:119
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -3971,19 +4269,20 @@ msgstr ""
 "iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
 "bir zaman aralığı olarak çözümlemeyi dener."
 
-#: g10/helptext.c:125
+#: g10/helptext.c:131
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:130
+#: g10/helptext.c:136
 msgid "please enter an optional but highly suggested email address"
-msgstr "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
+msgstr ""
+"lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
-#: g10/helptext.c:134
+#: g10/helptext.c:140
 msgid "Please enter an optional comment"
 msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:139
+#: g10/helptext.c:145
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -3997,36 +4296,46 @@ msgstr ""
 "D anahtar üretimine Devam etmek için.\n"
 "K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:154
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
 
-#: g10/helptext.c:156
+#: g10/helptext.c:162
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -4049,14 +4358,15 @@ msgstr ""
 "      sahibinin e-posta adresini kendisinin kullanmakta olduğunu da\n"
 "      denetlemişsinizdir.\n"
 "Burada 2 ve 3 için verilen örnekler *sadece* örnektir.\n"
-"Eninde sonunda bir anahtarı imzalarken \"ayrıntılı\" ve \"inceden inceye\" kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
+"Eninde sonunda bir anahtarı imzalarken \"ayrıntılı\" ve \"inceden inceye\" "
+"kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
 "Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
 
-#: g10/helptext.c:194
+#: g10/helptext.c:200
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:198
+#: g10/helptext.c:204
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4064,11 +4374,11 @@ msgstr ""
 "Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
 "Böylece bütün sertifikaları kaybedeceksiniz!"
 
-#: g10/helptext.c:203
+#: g10/helptext.c:209
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:208
+#: g10/helptext.c:214
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4078,7 +4388,7 @@ msgstr ""
 "sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
 "önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4090,13 +4400,13 @@ msgstr ""
 "ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
 "anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:225
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "İmza geçersiz. Onu anahtar zincirinizden kaldırmak uygun olacak."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4109,7 +4419,7 @@ msgstr ""
 "Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
 "kullanılabilir bir ikincisi var ise yapın."
 
-#: g10/helptext.c:231
+#: g10/helptext.c:237
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4119,23 +4429,23 @@ msgstr ""
 "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
 "tarafından öne alınacaktır.\n"
 
-#: g10/helptext.c:238
+#: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:250
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
 
-#: g10/helptext.c:248
+#: g10/helptext.c:254
 msgid "Give the name of the file to which the signature applies"
 msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:253
+#: g10/helptext.c:259
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
 
-#: g10/helptext.c:258
+#: g10/helptext.c:264
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4143,7 +4453,7 @@ msgstr ""
 "Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
 "parantez içinde gösterilen öntanımlı dosya kullanılacak."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:270
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4171,7 +4481,7 @@ msgstr ""
 "\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
 "\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
 
-#: g10/helptext.c:280
+#: g10/helptext.c:286
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4181,11 +4491,11 @@ msgstr ""
 "verdiğinizi açıklayan bir metin girebilirsiniz.\n"
 "Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:301
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:303
+#: g10/helptext.c:309
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
@@ -4248,6 +4558,35 @@ msgstr "%lu anahtar denetlendi (%lu imza)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|İSİM=DEĞER|veri bu nitelemeyle kullanılır"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "bir niteleme isminin ilk karakteri bir harf ya da altçizgi olmalı\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "bir niteleme isminde noktalar diğer karakterler tarafından kuşatılmış "
+#~ "olmalıdır\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "UYARI: Bu anahtarın zaten bir foto kimliği var.\n"
+#~ "    Başka bir foto kimliği eklemek PGP'in bazı sürümleriyle uyumsuz "
+#~ "olabilir.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Bir anahtarın sadece bir foto kimliği olabilir.\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr " Parmak izi:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "              Parmak izi:"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Onu yine de imzalamak istiyor musunuz?\n"