* de.po: Fixed fuzzys and translated new strings.

* es.po, et.po, fr.po, gl.po, id.po, it.po, ja.po, tr.po: Updated
from TP site.
* ca.po: New from TP site.

19 files changed, 15505 insertions, 13902 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index d7c9a351d..08996f8fe 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-04  Werner Koch  <wk@gnupg.org>
+
+	* de.po: Fixed fuzzys and translated new strings.
+	* es.po, et.po, fr.po, gl.po, id.po, it.po, ja.po, tr.po: Updated
+	from TP site.
+	* ca.po: New from TP site.
+
 2002-04-30  Werner Koch  <wk@gnupg.org>
 
 	* ja.po: Updated, also a bit too late for the release.
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 000000000..2d912f147
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,3797 @@
+# Missatges de gnupg en català
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Carles Sadurní Anguita <sadurni@jazzfree.com>, 2001.
+# Jordi Mallach <jordi@sindominio.net>, 2001, 2002.
+#
+# Coses:
+# ID d'usuari és masculí?
+# Canviar ID -> ID d'usuari
+# Xifratge vs. Xifrat
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.0.6\n"
+"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"PO-Revision-Date: 2002-06-03 20:37+0200\n"
+"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
+"Language-Team: Catalan <ca@dodds.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: util/secmem.c:84
+msgid "Warning: using insecure memory!\n"
+msgstr "Alerta: esteu usant memòria insegura!\n"
+
+#: util/secmem.c:304
+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
+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
+msgid "yes"
+msgstr "sí"
+
+#: util/miscutil.c:288 util/miscutil.c:319
+msgid "yY"
+msgstr "sS"
+
+#: util/miscutil.c:289 util/miscutil.c:317
+msgid "no"
+msgstr "no"
+
+#: util/miscutil.c:290 util/miscutil.c:320
+msgid "nN"
+msgstr "nN"
+
+#: g10/keyedit.c:581 util/miscutil.c:318
+msgid "quit"
+msgstr "eixir"
+
+#: util/miscutil.c:321
+msgid "qQ"
+msgstr "qQ"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "error general"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "tipus de paquet desconegut"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "versió desconeguda"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "algoritme de clau pública desconegut"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "algoritme de digest desconegut"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "clau pública errònia"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "clau secreta errònia"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "signatura errònia"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "suma de control errònia"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "contrasenya errònia"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "no s'ha trobat la clau pública"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "algoritme de xifrat desconegut"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "no s'ha pogut obrir l'anell"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "paquet invàlid"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "armadura invàlida"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "no s'ha trobat l'id de l'usuari"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "la clau secreta no està disponible"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "s'ha utilitzat una clau secreta incorrecta"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "no suportat"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "clau incorrecta"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "error de lectura"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "error d'escriptura"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "algoritme de compressió desconegut"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "error en l'obertura del fitxer"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "error en la creació del fitxer"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "contrasenya invàlida"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "algoritme de clau pública no implementat"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "algoritme de xifrat no implementat"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "classe de signatura desconeguda"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "error de la base de dades de confiança"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "MPI erroni"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "límit de recursos"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "l'anell no és vàlid"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "certificat incorrecte"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "id d'usuari mal formada"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "error en el tancament del fitxer"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "error en el reanomenament del fitxer"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "error a l'eliminar fitxer"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "dades inesperades"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "conflicte de data"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "algoritme de clau pública inusable"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "el fitxer existeix"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "clau feble"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "argument invàlid"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "URI errònia"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "URI no suportada"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "error de la xarxa"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "no xifrat"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "no processat"
+
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "clau pública inusable"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "clau secreta inusable"
+
+#: util/logger.c:224
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... açò és un bug (%s:%d:%s)\n"
+
+#: util/logger.c:230
+#, 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
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "no s'ha pogut obrir «%s»: %s\n"
+
+#: cipher/random.c:324
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "no es pot fer stat de «%s»: %s\n"
+
+#: cipher/random.c:329
+#, 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
+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"
+msgstr "alerta: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
+
+#: cipher/random.c:348
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "no s'ha pogut llegir «%s»: %s\n"
+
+#: cipher/random.c:386
+msgid "note: random_seed file not updated\n"
+msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
+
+#: cipher/random.c:406
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "no s'ha pogut crear «%s»: %s\n"
+
+#: cipher/random.c:413
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "no s'ha pogut escriure «%s»: %s\n"
+
+#: cipher/random.c:416
+#, 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
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "ALERTA: esteu usant un generador de nombres aleatoris insegur!!\n"
+
+#: cipher/random.c:662
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"El generador de nombres aleatoris és només un pedaç\n"
+"per a que funcioni - de cap manera és un GNA fort!\n"
+"\n"
+"NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
+"\n"
+
+#: cipher/rndlinux.c:142
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+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"
+
+#: g10/g10.c:216
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Ordres:\n"
+" "
+
+#: g10/g10.c:218
+msgid "|[file]|make a signature"
+msgstr "|[fitxer]|crea una signatura"
+
+#: g10/g10.c:219
+msgid "|[file]|make a clear text signature"
+msgstr "|[fitxer]|crea una signatura en text clar"
+
+#: g10/g10.c:220
+msgid "make a detached signature"
+msgstr "crea una firma separada"
+
+#: g10/g10.c:221
+msgid "encrypt data"
+msgstr "xifra dades"
+
+#: g10/g10.c:222
+msgid "encryption only with symmetric cipher"
+msgstr "xifra només amb xifratge simètric"
+
+#: g10/g10.c:223
+msgid "store only"
+msgstr "només emmagatzema"
+
+#: g10/g10.c:224
+msgid "decrypt data (default)"
+msgstr "desxifra dades (predeterminat)"
+
+#: g10/g10.c:225
+msgid "verify a signature"
+msgstr "verifica una signatura"
+
+#: g10/g10.c:227
+msgid "list keys"
+msgstr "llista claus"
+
+#: g10/g10.c:229
+msgid "list keys and signatures"
+msgstr "llista claus i signatures"
+
+#: g10/g10.c:230
+msgid "check key signatures"
+msgstr "comprova les signatures de les claus"
+
+#: g10/g10.c:231
+msgid "list keys and fingerprints"
+msgstr "llista claus i empremtes dactilars"
+
+#: g10/g10.c:232
+msgid "list secret keys"
+msgstr "llista claus secretes"
+
+#: g10/g10.c:233
+msgid "generate a new key pair"
+msgstr "genera un nou parell de claus"
+
+#: g10/g10.c:234
+msgid "remove key from the public keyring"
+msgstr "elimina una clau de l'anell públic"
+
+#: g10/g10.c:236
+msgid "remove key from the secret keyring"
+msgstr "elimina clau de l'anell secret"
+
+#: g10/g10.c:237
+msgid "sign a key"
+msgstr "firma una clau"
+
+#: g10/g10.c:238
+msgid "sign a key locally"
+msgstr "signa localment una clau"
+
+#: g10/g10.c:239
+msgid "sign or edit a key"
+msgstr "signa o edita una clau"
+
+#: g10/g10.c:240
+msgid "generate a revocation certificate"
+msgstr "genera un certificat de revocament"
+
+#: g10/g10.c:241
+msgid "export keys"
+msgstr "exporta claus"
+
+#: g10/g10.c:242
+msgid "export keys to a key server"
+msgstr "exporta claus a un servidor de claus"
+
+#: g10/g10.c:243
+msgid "import keys from a key server"
+msgstr "importa claus d'un servidor de claus"
+
+#: g10/g10.c:247
+msgid "import/merge keys"
+msgstr "importa/fon claus"
+
+#: g10/g10.c:249
+msgid "list only the sequence of packets"
+msgstr "llista només la seqüència de paquets"
+
+#: g10/g10.c:251
+msgid "export the ownertrust values"
+msgstr "exporta els valors de confiança"
+
+#: g10/g10.c:253
+msgid "import ownertrust values"
+msgstr "importa els valors de confiança"
+
+#: g10/g10.c:255
+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:258
+msgid "fix a corrupted trust database"
+msgstr "arregla una base de dades de confiança corrompuda"
+
+#: g10/g10.c:259
+msgid "De-Armor a file or stdin"
+msgstr "lleva l'armadura a un fitxer o a stdin"
+
+#: g10/g10.c:261
+msgid "En-Armor a file or stdin"
+msgstr "crea l'armadura a un fitxer o a stdin"
+
+#: g10/g10.c:263
+msgid "|algo [files]|print message digests"
+msgstr "|algo [fitxers]imprimeix digests de missatges"
+
+#: g10/g10.c:267
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcions:\n"
+" "
+
+#: g10/g10.c:269
+msgid "create ascii armored output"
+msgstr "crea eixida amb armadura ascii"
+
+#: g10/g10.c:271
+msgid "|NAME|encrypt for NAME"
+msgstr "|NOM|xifra per a NOM"
+
+#: g10/g10.c:274
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NOM|usa NOM com a destinatari predeterminat"
+
+#: g10/g10.c:276
+msgid "use the default key as default recipient"
+msgstr "usa la clau predeterminada com a destinatari predeterminat"
+
+#: g10/g10.c:280
+msgid "use this user-id to sign or decrypt"
+msgstr "usa aquest id per a signar o desxifrar"
+
+#: g10/g10.c:281
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|nivell de compressió N (0 no comprimeix)"
+
+#: g10/g10.c:283
+msgid "use canonical text mode"
+msgstr "usa mode de text canònic"
+
+#: g10/g10.c:284
+msgid "use as output file"
+msgstr "fitxer d'eixida"
+
+# Cal comprovar el context. jm
+#: g10/g10.c:285
+msgid "verbose"
+msgstr "detall"
+
+#: g10/g10.c:286
+msgid "be somewhat more quiet"
+msgstr "una mica més silenciós"
+
+#: g10/g10.c:287
+msgid "don't use the terminal at all"
+msgstr "no usa el terminal en absolut"
+
+#: g10/g10.c:288
+msgid "force v3 signatures"
+msgstr "força signatures v3"
+
+#: g10/g10.c:289
+msgid "always use a MDC for encryption"
+msgstr "sempre utilitza un MDC per a xifrar"
+
+#: g10/g10.c:290
+msgid "do not make any changes"
+msgstr "no fa cap canvi"
+
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr "utilitza el gpg-agent"
+
+#: g10/g10.c:293
+msgid "batch mode: never ask"
+msgstr "mode batch: no pregunta mai"
+
+#: g10/g10.c:294
+msgid "assume yes on most questions"
+msgstr "suposa «sí» en la majoria de les preguntes"
+
+#: g10/g10.c:295
+msgid "assume no on most questions"
+msgstr "suposa «no» en la majoria de les preguntes"
+
+#: g10/g10.c:296
+msgid "add this keyring to the list of keyrings"
+msgstr "afegeix aquest anell a la llista"
+
+#: g10/g10.c:297
+msgid "add this secret keyring to the list"
+msgstr "afegeix aquest anell secret a la llista"
+
+#: g10/g10.c:298
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOM|usa NOM com a clau secreta predeterminada"
+
+#: g10/g10.c:299
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|usa aquest servidor per a buscar claus"
+
+#: g10/g10.c:300
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NOM|el joc de caràcters serà NOM"
+
+#: g10/g10.c:301
+msgid "read options from file"
+msgstr "llig opcions del fitxer"
+
+#: g10/g10.c:305
+msgid "|FD|write status info to this FD"
+msgstr "|FD|escriu informació d'estat en aquest FD"
+
+#: g10/g10.c:310
+msgid "|KEYID|ultimately trust this key"
+msgstr "|IDCLAU|confia definitivament en aquesta clau"
+
+#: g10/g10.c:311
+msgid "|FILE|load extension module FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#: g10/g10.c:312
+msgid "emulate the mode described in RFC1991"
+msgstr "emula el mode descrit en RFC1991"
+
+#: g10/g10.c:313
+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"
+
+#: g10/g10.c:314
+msgid "|N|use passphrase mode N"
+msgstr "|N|usa el mode de contrasenya especificat"
+
+#: g10/g10.c:316
+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
+msgid "|NAME|use cipher algorithm NAME for passphrases"
+msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
+
+#: g10/g10.c:319
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOM|usa l'algoritme de xifratge NOM"
+
+#: g10/g10.c:320
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOM|usa l'algoritme de digest de missatges NOM"
+
+#: g10/g10.c:321
+msgid "|N|use compress algorithm N"
+msgstr "|N|usa l'algoritme de compressió N"
+
+# elimina o descarta? jm
+#: g10/g10.c:322
+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:326
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
+
+#: g10/g10.c:329
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Exemples:\n"
+"\n"
+" -se -r Pep [fitxer]        signa i xifra per a l'usuari Pep\n"
+" --clearsign [fitxer]       crea una signatura en text clar\n"
+" --detach-sign [fitxer]     crea una signatura separada\n"
+" --list-keys [noms]         mostra claus\n"
+" --fingerprint [noms]       mostra empremtes dactilars\n"
+
+#: g10/g10.c:438
+msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
+msgstr "Per favor informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
+
+#: g10/g10.c:442
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: g10/g10.c:445
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintaxi: gpg [opcions] [fitxers]\n"
+"signa, comprova, xifra o desxifra\n"
+"l'operació predeterminada depén de les dades introduïdes\n"
+
+#: g10/g10.c:452
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Algoritmes admesos:\n"
+
+#: g10/g10.c:531
+msgid "usage: gpg [options] "
+msgstr "ús: gpg [opcions] "
+
+#: g10/g10.c:584
+msgid "conflicting commands\n"
+msgstr "ordres en conflicte\n"
+
+#: g10/g10.c:734
+#, 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
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "fitxer d'opcions «%s»: %s\n"
+
+#: g10/g10.c:745
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "llegint opcions de «%s»\n"
+
+#: g10/g10.c:950
+#, 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
+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
+#, 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
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s no és permés amb %s!\n"
+
+#: g10/g10.c:1033
+#, 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
+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
+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:1078
+#, 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
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed ha de ser major que 0\n"
+
+#: g10/g10.c:1082
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed ha de ser major que 1\n"
+
+#: g10/g10.c:1084
+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
+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
+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
+#, 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
+msgid "--store [filename]"
+msgstr "--store [nom_del_fitxer]"
+
+#: g10/g10.c:1189
+msgid "--symmetric [filename]"
+msgstr "--symmetric [nom_del_fitxer]"
+
+#: g10/g10.c:1197
+msgid "--encrypt [filename]"
+msgstr "--encrypt [nom_del_fitxer]"
+
+#: g10/g10.c:1210
+msgid "--sign [filename]"
+msgstr "--sign [nom_del_fitxer]"
+
+#: g10/g10.c:1223
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [nom_del_fitxer]"
+
+#: g10/g10.c:1237
+msgid "--clearsign [filename]"
+msgstr "--clearsign [nom_del_fitxer]"
+
+#: g10/g10.c:1254
+msgid "--decrypt [filename]"
+msgstr "--decrypt [nom_del_fitxer]"
+
+#: g10/g10.c:1262
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
+#: g10/g10.c:1270
+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:1297
+msgid "--delete-key user-id"
+msgstr "--delete-key user-id"
+
+#: g10/g10.c:1305
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-and-public-key user-id"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "no s'ha pogut obrir %s: %s\n"
+
+#: g10/g10.c:1357
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [user-id] [anell]"
+
+#: g10/g10.c:1423
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "no s'ha pogut llevar l'armadura: %s\n"
+
+#: g10/g10.c:1431
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "no s'ha pogut crear l'armadura: %s\n"
+
+#: g10/g10.c:1502
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr ""
+"algoritme de hash invàlid «%s»\n"
+"\n"
+
+#: g10/g10.c:1589
+msgid "[filename]"
+msgstr "[nom_del_fitxer]"
+
+#: g10/g10.c:1593
+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
+#, 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:1825
+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
+#, c-format
+msgid "armor: %s\n"
+msgstr "armadura: %s\n"
+
+#: g10/armor.c:335
+msgid "invalid armor header: "
+msgstr "capçalera d'armadura no vàlida: "
+
+#: g10/armor.c:342
+msgid "armor header: "
+msgstr "capçalera d'armadura: "
+
+#: g10/armor.c:353
+msgid "invalid clearsig header\n"
+msgstr "capçalera de signatura clara invàlida\n"
+
+#: g10/armor.c:405
+msgid "nested clear text signatures\n"
+msgstr "signatures en text pla anidades\n"
+
+#: g10/armor.c:529
+msgid "invalid dash escaped line: "
+msgstr "línia escapada amb guió no vàlida: "
+
+#: g10/armor.c:541
+msgid "unexpected armor:"
+msgstr "armadura inesperada:"
+
+#: g10/armor.c:667 g10/armor.c:1235
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caràcter radix64 %02x invàlid omés\n"
+
+#: g10/armor.c:710
+msgid "premature eof (no CRC)\n"
+msgstr "fi de fitxer prematur (no CRC)\n"
+
+#: g10/armor.c:744
+msgid "premature eof (in CRC)\n"
+msgstr "fi de fitxer prematur (en CRC)\n"
+
+#: g10/armor.c:748
+msgid "malformed CRC\n"
+msgstr "CRC mal format\n"
+
+#: g10/armor.c:752 g10/armor.c:1272
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "error de CRC; %06lx - %06lx\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in Trailer)\n"
+msgstr "fí de fitxer prematur (al final)\n"
+
+#: g10/armor.c:776
+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
+msgid "no valid OpenPGP data found.\n"
+msgstr "no s'han trobat dades OpenPGP vàlides.\n"
+
+#: g10/armor.c:1055
+#, 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/pkclist.c:116
+msgid "No reason specified"
+msgstr "No s'ha especificat cap raó"
+
+#: g10/pkclist.c:118
+msgid "Key is superseded"
+msgstr "La clau ha estat substituïda"
+
+#: g10/pkclist.c:120
+msgid "Key has been compromised"
+msgstr "La clau ha estat compromesa"
+
+#: g10/pkclist.c:122
+msgid "Key is no longer used"
+msgstr "La clau ja no s'usa"
+
+#: g10/pkclist.c:124
+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: "
+msgstr "Raó de la revocació: "
+
+#: g10/pkclist.c:145
+msgid "Revocation comment: "
+msgstr "Comentari: "
+
+#. a string with valid answers
+#: g10/pkclist.c:303
+msgid "sSmMqQ"
+msgstr "sSmMqQ"
+
+#: g10/pkclist.c:307
+#, c-format
+msgid ""
+"No trust value assigned to %lu:\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
+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"
+"comprovant empremtes de diferents fonts...)?\n"
+"\n"
+" 1 = No ho sé\n"
+" 2 = No hi confie\n"
+" 3 = Hi confie poc\n"
+" 4 = Hi confie completament\n"
+" s = mostra més informació\n"
+
+#: g10/pkclist.c:328
+msgid " m = back to the main menu\n"
+msgstr " m = torna al menú principal\n"
+
+#: g10/pkclist.c:330
+msgid " q = quit\n"
+msgstr " q = ix\n"
+
+#: g10/pkclist.c:336
+msgid "Your decision? "
+msgstr "La vostra decisió? "
+
+#: g10/pkclist.c:358
+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
+#, 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
+msgid "Use this key anyway? "
+msgstr "Voleu usar de tota manera aquesta clau?"
+
+#: g10/pkclist.c:469
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "clau %08lX: aquesta subclau ha estat revocada!\n"
+
+#: g10/pkclist.c:512
+#, 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:533
+#, 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
+#, c-format
+msgid ""
+"%08lX: It is not sure that this key really belongs to the owner\n"
+"but it is accepted anyway\n"
+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
+msgid "This key probably belongs to the owner\n"
+msgstr "Aquesta clau pertany probablement al seu propietari\n"
+
+#: g10/pkclist.c:550
+msgid "This key belongs to us\n"
+msgstr "Aquesta clau és nostra\n"
+
+#: g10/pkclist.c:593
+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"
+"the next question with yes\n"
+"\n"
+msgstr ""
+"No és segur que la clau pertanga al seu propietari.\n"
+"Si realment sabeu què feu, podeu respondre\n"
+"que sí a la següent pregunta\n"
+"\n"
+
+#: g10/pkclist.c:607 g10/pkclist.c:630
+msgid "WARNING: Using untrusted key!\n"
+msgstr "ALERTA: És una clau no fiable!\n"
+
+#: g10/pkclist.c:651
+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
+msgid "         This could mean that the signature is forgery.\n"
+msgstr " Açò podria significar que la signatura és falsificada.\n"
+
+#: g10/pkclist.c:657
+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
+msgid "Note: This key has expired!\n"
+msgstr "Nota: La clau ha caducat!\n"
+
+#: g10/pkclist.c:687
+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:706
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "ALERTA: La clau no és de confiança!\n"
+
+#: g10/pkclist.c:707
+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"
+msgstr "ALERTA: Aquesta clau no ve certificada per signatures prou fiables!\n"
+
+#: g10/pkclist.c:717
+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
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: ignorat: %s\n"
+
+#: g10/pkclist.c:826 g10/pkclist.c:993
+#, 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"
+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:875
+msgid "No such user ID.\n"
+msgstr "Usuari inexistent.\n"
+
+#: g10/pkclist.c:880
+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
+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:941
+#, 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
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: ignorat: la clau pública està desactivada\n"
+
+#: g10/pkclist.c:1017
+msgid "no valid addressees\n"
+msgstr "no hi ha adreces vàlides\n"
+
+#: g10/keygen.c:176
+msgid "writing self signature\n"
+msgstr "escriptura de l'autosignatura\n"
+
+#: g10/keygen.c:217
+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
+#, 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
+#, 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
+msgid "Please select what kind of key you want:\n"
+msgstr "Trieu quin tipus de clau voleu:\n"
+
+#: g10/keygen.c:551
+#, c-format
+msgid "   (%d) DSA and ElGamal (default)\n"
+msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
+
+#: g10/keygen.c:552
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (només signar)\n"
+
+#: g10/keygen.c:554
+#, c-format
+msgid "   (%d) ElGamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (només xifrar)\n"
+
+#: g10/keygen.c:555
+#, c-format
+msgid "   (%d) ElGamal (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (signar i xifrar)\n"
+
+#: g10/keygen.c:557
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (signar i xifrar)\n"
+
+#: g10/keygen.c:561
+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
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr "L'us d'aquest algoritme està desaconsellat - crear igualment? "
+
+#: g10/keygen.c:594
+msgid "Invalid selection.\n"
+msgstr "Selecció invàlida.\n"
+
+#: g10/keygen.c:606
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Preparat per a generar un nou parell de claus %s.\n"
+"              grandària mínima:  768 bits\n"
+"      grandària predeterminada: 1024 bits\n"
+"  grandària màxima aconsellada: 2048 bits\n"
+
+#: g10/keygen.c:613
+msgid "What keysize do you want? (1024) "
+msgstr "Quina grandària voleu? (1024) "
+
+#: g10/keygen.c:618
+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
+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"
+
+#. 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
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * 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
+#, 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
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+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
+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:656
+#, 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
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "arrodonida fins a %u bits\n"
+
+#: g10/keygen.c:711
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key 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:726
+msgid "Key is valid for? (0) "
+msgstr "Indiqueu la validesa de la clau (0) "
+
+#: g10/keygen.c:731
+msgid "invalid value\n"
+msgstr "valor invàlid\n"
+
+#: g10/keygen.c:736
+msgid "Key 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"
+msgstr "La clau caduca el %s\n"
+
+#: g10/keygen.c:745
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+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
+msgid "Is this correct (y/n)? "
+msgstr "És correcte? (s/n)"
+
+#: g10/keygen.c:793
+msgid ""
+"\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) <heinrichh@duesseldorf.de>\"\n"
+"\n"
+msgstr ""
+"\n"
+"Necessiteu un ID d'usuari per a identificar la vostra clau; el programa\n"
+"construeix la id de l'usuari amb el Nom, Comentari i Adreça electrònica\n"
+"d'aquesta forma:\n"
+"    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
+"\n"
+
+#: g10/keygen.c:805
+msgid "Real name: "
+msgstr "Nom i cognoms"
+
+#: g10/keygen.c:813
+msgid "Invalid character in name\n"
+msgstr "Caràcter invàlid en el camp *nom*\n"
+
+#: g10/keygen.c:815
+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
+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
+msgid "Email address: "
+msgstr "Adreça electrònica: "
+
+#: g10/keygen.c:836
+msgid "Not a valid email address\n"
+msgstr "No és una adreça vàlida\n"
+
+#: g10/keygen.c:844
+msgid "Comment: "
+msgstr "Comentari: "
+
+#: g10/keygen.c:850
+msgid "Invalid character in comment\n"
+msgstr "Caràcter invàlid en el camp *comentari*\n"
+
+#: g10/keygen.c:873
+#, 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
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"Heu triat l'usuari:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:883
+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
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:898
+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
+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
+msgid "Please correct the error first\n"
+msgstr "Corregiu l'error primer\n"
+
+#: g10/keygen.c:956
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+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"
+msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho\n"
+
+#: g10/keygen.c:970
+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"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"No voleu contrasenya: és una mala idea!\n"
+"Bé. Si voleu canviar-la més endavant,\n"
+"useu aquest programa amb l'opció \"--edit-key\".\n"
+"\n"
+
+#: g10/keygen.c:991
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Cal generar molts bits aleatoriament. És bona idea fer alguna altra cosa\n"
+"(teclejar, moure el ratolí, usar els discos) durant la generació de\n"
+"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
+"d'aconseguir prou entropia.\n"
+
+#: g10/keygen.c:1440
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
+
+#: g10/keygen.c:1483
+msgid "Key generation canceled.\n"
+msgstr "Generació de claus cancel·lada.\n"
+
+#: g10/keygen.c:1581
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "escriptura de la clau pública a `%s'\n"
+
+#: g10/keygen.c:1582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "escriptura de la clau privada a `%s'\n"
+
+#: g10/keygen.c:1679
+msgid "public and secret key created and signed.\n"
+msgstr "claus pública i privada creades i signades.\n"
+
+#: g10/keygen.c:1684
+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 ""
+"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
+#, 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
+#, c-format
+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
+#, c-format
+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
+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
+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
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: no s'ha pogut obrir: %s\n"
+
+#: g10/encode.c:113
+#, 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
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: ALERTA: fitxer buit\n"
+
+#: g10/encode.c:274
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "llegint des de «%s»\n"
+
+#: g10/encode.c:497
+#, 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/export.c:162
+#, c-format
+msgid "certificate read problem: %s\n"
+msgstr "problema en la lectura del certificat: %s\n"
+
+#: g10/export.c:171
+#, 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
+#, c-format
+msgid "key %08lX: not protected - skipped\n"
+msgstr "clau %08lX: no protegida - ignorada\n"
+
+#: g10/export.c:236
+msgid "WARNING: nothing exported\n"
+msgstr "ALERTA: no s'hi ha exportat res\n"
+
+#: g10/getkey.c:214
+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
+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:2196
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%lu keys so far processed\n"
+msgstr "fins ara s'han processat %lu claus\n"
+
+#: g10/import.c:196
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: g10/import.c:206
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Nombre total processat: %lu\n"
+
+#: g10/import.c:208
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr " claus noves ignorades: %lu\n"
+
+#: g10/import.c:211
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "              sense ID: %lu\n"
+
+#: g10/import.c:213
+#, c-format
+msgid "              imported: %lu"
+msgstr "            importades: %lu"
+
+#: g10/import.c:219
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "        no modificades: %lu\n"
+
+#: g10/import.c:221
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "    IDs d'usuaris nous: %lu\n"
+
+#: g10/import.c:223
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "        subclaus noves: %lu\n"
+
+#: g10/import.c:225
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "      signatures noves: %lu\n"
+
+#: g10/import.c:227
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "     noves revocacions: %lu\n"
+
+#: g10/import.c:229
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "claus privades llegides: %lu\n"
+
+#: g10/import.c:231
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "claus privades importades: %lu\n"
+
+#: g10/import.c:233
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "claus privades no canviades: %lu\n"
+
+#: g10/import.c:408 g10/import.c:617
+#, c-format
+msgid "key %08lX: no user ID\n"
+msgstr "clau %08lX: sense ID\n"
+
+#: g10/import.c:422
+#, c-format
+msgid "key %08lX: no valid user IDs\n"
+msgstr "clau %08lX: l'ID no és vàlid\n"
+
+#: g10/import.c:424
+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
+#, 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
+#, 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:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#, 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
+#, 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"
+msgstr "clau %08lX: clau pública importada\n"
+
+#: g10/import.c:480
+#, 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
+#, 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
+#, 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"
+msgstr "clau %08lX: 1 ID d'usuari nou\n"
+
+#: g10/import.c:525
+#, c-format
+msgid "key %08lX: %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"
+msgstr "clau %08lX: 1 signatura nova\n"
+
+#: g10/import.c:531
+#, c-format
+msgid "key %08lX: %d new signatures\n"
+msgstr "clau %08lX: %d signatures noves\n"
+
+#: g10/import.c:534
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
+msgstr "clau %08lX: 1 subclau nova\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
+msgstr "clau %08lX: %d subclaus noves\n"
+
+#: g10/import.c:547
+#, c-format
+msgid "key %08lX: 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:640
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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"
+msgstr "clau %08lX: certificat de revocació importat\n"
+
+#: g10/import.c:783
+#, 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"
+msgstr "clau %08lX: algoritme de clau pública no suportat\n"
+
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: invalid self-signature\n"
+msgstr "clau %08lX: autofirma no vàlida\n"
+
+#: g10/import.c:806
+#, 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
+#, c-format
+msgid "key %08lX: invalid subkey binding\n"
+msgstr "clau %08lX: enllaç de subclau invàlid\n"
+
+#: g10/import.c:842
+#, c-format
+msgid "key %08lX: accepted non self-signed user ID '"
+msgstr "clau %08lX: s'ha acceptat la ID d'usuari no auto-signada '"
+
+#: g10/import.c:871
+#, c-format
+msgid "key %08lX: skipped user ID '"
+msgstr "clau %08lX: ID ignorat '"
+
+#: g10/import.c:894
+#, c-format
+msgid "key %08lX: skipped subkey\n"
+msgstr "clau %08lX: subclau ignorada\n"
+
+#. here we violate the rfc a bit by still allowing
+#. * 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr "clau %08lX: detectat ID duplicat - fusionat\n"
+
+#: g10/import.c:1088
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
+msgstr "clau %08lX: s'hi ha afegit el certificat de revocació\n"
+
+#: g10/import.c:1202 g10/import.c:1255
+#, c-format
+msgid "key %08lX: our copy has no self-signature\n"
+msgstr "clau %08lX: la nostra còpia no té auto-signatura\n"
+
+#: 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/keyedit.c:156
+msgid "[revocation]"
+msgstr "[revocació]"
+
+#: g10/keyedit.c:157
+msgid "[self-signature]"
+msgstr "[autosignatura]"
+
+#: g10/keyedit.c:221
+msgid "1 bad signature\n"
+msgstr "1 signatura errònia\n"
+
+#: g10/keyedit.c:223
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d signatures errònies\n"
+
+#: g10/keyedit.c:225
+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
+#, 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
+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
+#, 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
+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
+#, 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
+#, c-format
+msgid "Already signed by key %08lX\n"
+msgstr "Ja està signat amb la clau %08lX\n"
+
+#: g10/keyedit.c:325
+#, 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
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Esteu segurs que voleu signar aquesta clau\n"
+"amb la vostra clau: \""
+
+#: g10/keyedit.c:343
+msgid ""
+"The signature will be marked as non-exportable.\n"
+"\n"
+msgstr ""
+"La signatura es marcarà com a inexportable.\n"
+"\n"
+
+#: g10/keyedit.c:348
+msgid "Really sign? "
+msgstr "Signar realment? "
+
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "Ha fallat el procés de signatura: %s\n"
+
+#: g10/keyedit.c:428
+msgid "This key is not protected.\n"
+msgstr "Aquesta clau no està protegida.\n"
+
+#: g10/keyedit.c:432
+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
+msgid "Key is protected.\n"
+msgstr "La clau està protegida.\n"
+
+#: g10/keyedit.c:456
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "No es pot editar aquesta clau: %s\n"
+
+#: g10/keyedit.c:461
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Introduïu la nova contrasenya per a la clau secreta.\n"
+"\n"
+
+#: g10/keyedit.c:473
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"No voleu contrasenya: açò és probablement una *mala* idea!\n"
+"\n"
+
+#: g10/keyedit.c:476
+msgid "Do you really want to do this? "
+msgstr "N'esteu segur de voler fer açò? "
+
+#: g10/keyedit.c:540
+msgid "moving a key signature to the correct place\n"
+msgstr "posant la signatura al lloc correcte\n"
+
+#: g10/keyedit.c:581
+msgid "quit this menu"
+msgstr "eixit del menú"
+
+#: g10/keyedit.c:582
+msgid "q"
+msgstr "q"
+
+#: g10/keyedit.c:583
+msgid "save"
+msgstr "desa"
+
+#: g10/keyedit.c:583
+msgid "save and quit"
+msgstr "desa i ix"
+
+#: g10/keyedit.c:584
+msgid "help"
+msgstr "ajuda"
+
+#: g10/keyedit.c:584
+msgid "show this help"
+msgstr "mostrar aquesta pantalla"
+
+#: g10/keyedit.c:586
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:586
+msgid "show fingerprint"
+msgstr "mostra empremta"
+
+#: g10/keyedit.c:587
+msgid "list"
+msgstr "llista"
+
+#: g10/keyedit.c:587
+msgid "list key and user IDs"
+msgstr "llista claus i ID"
+
+#: g10/keyedit.c:588
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:589
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:589
+msgid "select user ID N"
+msgstr "triar ID N"
+
+#: g10/keyedit.c:590
+msgid "key"
+msgstr "clau"
+
+#: g10/keyedit.c:590
+msgid "select secondary key N"
+msgstr "tria clau secundària N"
+
+#: g10/keyedit.c:591
+msgid "check"
+msgstr "comprovar"
+
+#: g10/keyedit.c:591
+msgid "list signatures"
+msgstr "llista signatures"
+
+#: g10/keyedit.c:592
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:593
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:593
+msgid "sign the key"
+msgstr "signa la clau"
+
+#: g10/keyedit.c:594
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:595
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:595
+msgid "sign the key locally"
+msgstr "signar la clau localment"
+
+#: g10/keyedit.c:596
+msgid "debug"
+msgstr "depura"
+
+#: g10/keyedit.c:597
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:597
+msgid "add a user ID"
+msgstr "afegir ID d'usuari"
+
+#: g10/keyedit.c:598
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:598
+msgid "delete user ID"
+msgstr "esborrar ID d'usuari"
+
+#: g10/keyedit.c:599
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:599
+msgid "add a secondary key"
+msgstr "afegir una clau secundària"
+
+#: g10/keyedit.c:600
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:600
+msgid "delete a secondary key"
+msgstr "esborrar una clau secundària"
+
+#: g10/keyedit.c:601
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:601
+msgid "delete signatures"
+msgstr "esborrar signatures"
+
+#: g10/keyedit.c:602
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:602
+msgid "change the expire date"
+msgstr "canviar la data de caducitat"
+
+#: g10/keyedit.c:603
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:603
+msgid "toggle between secret and public key listing"
+msgstr "canvia entre el llistat de claus secretes i públiques"
+
+#: g10/keyedit.c:605
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:606
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:606 g10/keyedit.c:607
+msgid "list preferences"
+msgstr "llista les preferències"
+
+#: g10/keyedit.c:607
+msgid "showpref"
+msgstr "showpref"
+
+#: g10/keyedit.c:608
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:608
+msgid "change the passphrase"
+msgstr "canvia la contrasenya"
+
+#: g10/keyedit.c:609
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:609
+msgid "change the ownertrust"
+msgstr "canvia la confiança"
+
+#: g10/keyedit.c:610
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:610
+msgid "revoke signatures"
+msgstr "revoca signatures"
+
+#: g10/keyedit.c:611
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:611
+msgid "revoke a secondary key"
+msgstr "revoca una clau secundària"
+
+#: g10/keyedit.c:612
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:612
+msgid "disable a key"
+msgstr "desactivar clau"
+
+#: g10/keyedit.c:613
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:613
+msgid "enable a key"
+msgstr "activa una clau"
+
+#: g10/delkey.c:110 g10/keyedit.c:633
+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
+msgid "Secret key is available.\n"
+msgstr "La clau secreta està disponible.\n"
+
+#: g10/keyedit.c:700
+msgid "Command> "
+msgstr "Ordre>"
+
+#: g10/keyedit.c:730
+msgid "Need the secret key to do this.\n"
+msgstr "Cal la clau secreta per a fer açò.\n"
+
+#: g10/keyedit.c:734
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Useu l'ordre «toggle» abans.\n"
+
+#: g10/keyedit.c:781
+msgid "Really sign all user IDs? "
+msgstr "Signar tots els IDs? "
+
+#: g10/keyedit.c:782
+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
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
+
+#: g10/keyedit.c:825 g10/keyedit.c:846
+msgid "You must select at least one user ID.\n"
+msgstr "Heu de seleccionar al menys un ID.\n"
+
+#: g10/keyedit.c:827
+msgid "You can't delete the last user ID!\n"
+msgstr "No podeu esborrar l'últim ID!\n"
+
+#: g10/keyedit.c:830
+msgid "Really remove all selected user IDs? "
+msgstr "Eliminar tots els IDs seleccionats? "
+
+#: g10/keyedit.c:831
+msgid "Really remove this user ID? "
+msgstr "Eliminar aquest ID? "
+
+#: g10/keyedit.c:867 g10/keyedit.c:889
+msgid "You must select at least one key.\n"
+msgstr "Heu de seleccionar, si més no, una clau.\n"
+
+#: g10/keyedit.c:871
+msgid "Do you really want to delete the selected keys? "
+msgstr "Realment voleu esborrar les claus seleccionades? "
+
+#: g10/keyedit.c:872
+msgid "Do you really want to delete this key? "
+msgstr "Realment voleu eliminar aquesta clau? "
+
+#: g10/keyedit.c:893
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Realment voleu revocar les claus seleccionades? "
+
+#: g10/keyedit.c:894
+msgid "Do you really want to revoke this key? "
+msgstr "Realment voleu revocar aquesta clau? "
+
+#: g10/keyedit.c:964
+msgid "Save changes? "
+msgstr "Desar els canvis? "
+
+#: g10/keyedit.c:967
+msgid "Quit without saving? "
+msgstr "Eixir sense desar? "
+
+#: g10/keyedit.c:978
+#, c-format
+msgid "update failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#: g10/keyedit.c:985
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "ha fallat l'actualització de la clau secreta: %s\n"
+
+#: g10/keyedit.c:992
+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
+msgid "Invalid command  (try \"help\")\n"
+msgstr "L'ordre no és vàlida (proveu «help»)\n"
+
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#, 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
+#, c-format
+msgid " trust: %c/%c"
+msgstr " confiança: %c/%c"
+
+#: g10/keyedit.c:1144
+msgid "This key has been disabled"
+msgstr "Aquesta clau ha estat desactivada"
+
+#: g10/keyedit.c:1173
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! la subclau ha estat revocada: %s\n"
+
+#: g10/keyedit.c:1176
+msgid "rev- faked revocation found\n"
+msgstr "rev- s'ha trobat una revocació falsa\n"
+
+#: g10/keyedit.c:1178
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? problemes en la comprovació de la revocació: %s\n"
+
+#: g10/keyedit.c:1420
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Esborrar aquesta signatura correcta? (y/N/q)"
+
+#: g10/keyedit.c:1424
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Esborrar aquesta signatura invàlida? (y/N/q)"
+
+#: g10/keyedit.c:1428
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Esborrar aquesta signatura desconeguda? (y/N/q)"
+
+#: g10/keyedit.c:1434
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Esborrar aquesta auto-signatura? (y/N)"
+
+#: g10/keyedit.c:1448
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d signatura esborrada.\n"
+
+#: g10/keyedit.c:1449
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d signatures esborrades.\n"
+
+#: g10/keyedit.c:1452
+msgid "Nothing deleted.\n"
+msgstr "No s'hi ha eliminat res.\n"
+
+#: g10/keyedit.c:1521
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
+
+#: g10/keyedit.c:1527
+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
+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
+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
+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
+msgid "No corresponding signature in secret ring\n"
+msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
+
+#: g10/keyedit.c:1652
+#, 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
+#, 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
+msgid "user ID: \""
+msgstr "ID d'usuari: \""
+
+#: g10/keyedit.c:1799
+#, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+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)"
+msgstr "Crear un certificat de revocació per a aquesta signatura? (y/N)"
+
+#. FIXME: detect duplicates here
+#: g10/keyedit.c:1827
+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"
+msgstr "  signat per %08lX el %s\n"
+
+#: g10/keyedit.c:1846
+#, c-format
+msgid "   revoked by %08lX at %s\n"
+msgstr "  revocat per %08lX el %s\n"
+
+#: g10/keyedit.c:1866
+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)"
+msgstr "Crear els certificats de revocació? (y/N)"
+
+#: g10/keyedit.c:1913
+msgid "no secret key\n"
+msgstr "ho hi ha clau secreta\n"
+
+#. of subkey
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
+msgid " [expires: %s]"
+msgstr "[caduca: %s]"
+
+#: g10/mainproc.c:269
+#, c-format
+msgid "public key is %08lX\n"
+msgstr "la clau pública és %08lX\n"
+
+#: g10/mainproc.c:314
+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
+#, 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
+#, c-format
+msgid "encrypted with %s key, ID %08lX\n"
+msgstr "xifrat amb una clau %s, ID %08lX\n"
+
+#: g10/mainproc.c:390
+#, 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
+msgid "decryption okay\n"
+msgstr "desxifratge correcte\n"
+
+#: g10/mainproc.c:435
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "ALERTA: el missatge xifrat ha estat manipulat!\n"
+
+#: g10/mainproc.c:440
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "ha fallat el desxifratge: %s\n"
+
+#: g10/mainproc.c:459
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
+
+#: g10/mainproc.c:461
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "nom del fitxer original='%.*s'\n"
+
+#: g10/mainproc.c:632
+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
+msgid "Notation: "
+msgstr "Notació: "
+
+#: g10/mainproc.c:740
+msgid "Policy: "
+msgstr "Política: "
+
+#: g10/mainproc.c:1193
+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
+msgid "can't handle these multiple signatures\n"
+msgstr "no es poden manejar aquestes signatures múltiples\n"
+
+#: g10/mainproc.c:1256
+#, 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
+msgid "BAD signature from \""
+msgstr "Signatura INCORRECTA de \""
+
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
+msgid "Good signature from \""
+msgstr "Signatura correcta de \""
+
+#: g10/mainproc.c:1308
+msgid "                aka \""
+msgstr "              alias \""
+
+#: g10/mainproc.c:1358
+#, 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
+msgid "not a detached signature\n"
+msgstr "no és una signatura separada\n"
+
+#: g10/mainproc.c:1454
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "signatura autònoma de classe 0x%02x\n"
+
+#: g10/mainproc.c:1511
+msgid "old style (PGP 2.x) signature\n"
+msgstr "signatura de l'estil antic (PGP 2.x)\n"
+
+#: g10/mainproc.c:1518
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "paquet arrel invàlid detectat en proc_tree()\n"
+
+#: g10/misc.c:98
+#, 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
+msgid "Experimental algorithms should not be used!\n"
+msgstr "No hauríeu d'usar algoritmes experimentals!\n"
+
+#: g10/misc.c:238
+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"
+
+#: g10/parse-packet.c:119
+#, 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
+#, 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
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#: g10/passphrase.c:229
+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
+#, 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
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (ID de la clau principal %08lX)"
+
+# Com es canvia l'ordre dels arguments? jm
+# Ah, bingo! jm
+# Uh, ara torna a donar error.
+# La idea és ficar:
+# "Necessiteu la contrasenya per desbloquejar la clau secreta de l'usuari:\n"
+# "«%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
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Necessiteu la contrasenya per desbloquejar la clau secreta de l'usuari:\n"
+"«%.*s»\n"
+"clau de %u bits, %s, ID %08lX, creada en %s%s\n"
+
+#: g10/passphrase.c:344
+msgid "Enter passphrase\n"
+msgstr "Introduïu contrasenya\n"
+
+#: g10/passphrase.c:346
+msgid "Repeat passphrase\n"
+msgstr "Repetiu contrasenya\n"
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr "contrasenya massa llarga\n"
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr "resposta invàlida del agent\n"
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr "cancel·lat per l'usuari\n"
+
+#: g10/passphrase.c:408 g10/passphrase.c:481
+#, 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
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Necessiteu la contrasenya per desbloquejar la clau secreta de\n"
+"l'usuari: \""
+
+#: g10/passphrase.c:575
+#, 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
+msgid "can't query password in batchmode\n"
+msgstr "no es pot demanar la contrasenya en mode batch\n"
+
+#: g10/passphrase.c:617
+msgid "Enter passphrase: "
+msgstr "Introduïu contrasenya: "
+
+#: g10/passphrase.c:621
+msgid "Repeat passphrase: "
+msgstr "Repetiu contrasenya: "
+
+#: g10/plaintext.c:67
+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
+msgid "Detached signature.\n"
+msgstr "Signatura separada.\n"
+
+#: g10/plaintext.c:336
+msgid "Please enter name of data file: "
+msgstr "Introduïu el nom del fitxer de dades: "
+
+#: g10/plaintext.c:357
+msgid "reading stdin ...\n"
+msgstr "llegint stdin...\n"
+
+#: g10/plaintext.c:391
+msgid "no signed data\n"
+msgstr "no hi ha dades signades\n"
+
+#: g10/plaintext.c:399
+#, 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"
+msgstr "destinatari anònim; es provarà la clau secreta %08lX...\n"
+
+#: g10/pubkey-enc.c:82
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "d'acord, som el destinatari anònim.\n"
+
+#: g10/pubkey-enc.c:134
+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"
+msgstr "l'algoritme de xifratge %d és desconegut o està desactivat\n"
+
+#: g10/pubkey-enc.c:192
+#, 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
+#, 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"
+msgstr "sol·licitud de la clau %08lX de %s...\n"
+
+#: g10/hkp.c:83
+#, 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
+#, c-format
+msgid "error sending to `%s': %s\n"
+msgstr "error mentre s'enviava a `%s': %s\n"
+
+#: g10/hkp.c:203
+#, 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
+#, c-format
+msgid "failed sending to `%s': status=%u\n"
+msgstr "l'enviament a `%s' ha fallat: status=%u\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"
+msgstr "l'algoritme de protecció %d no està suportat\n"
+
+#: g10/seckey-cert.c:184
+msgid "Invalid passphrase; please try again ...\n"
+msgstr "La contrasenya no és vàlida; torneu a intentar-ho...\n"
+
+#: g10/seckey-cert.c:240
+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/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:305
+#, 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
+#, 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
+#, 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
+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"
+
+#: g10/sign.c:152
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "No s'ha pogut comprovar la signatura creada: %s\n"
+
+#: g10/sign.c:161
+#, c-format
+msgid "%s signature from: %s\n"
+msgstr "%s signatura de: %s\n"
+
+#: g10/sign.c:307 g10/sign.c:630
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "no s'ha pogut creat %s: %s\n"
+
+#: g10/sign.c:405
+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/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "no es poden manejar línies més llargues de %d caràcters\n"
+
+#: g10/textfilter.c:231
+#, c-format
+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
+#, 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
+#, 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"
+
+#: g10/tdbio.c:232
+msgid "trustdb transaction too large\n"
+msgstr "transacció de la base de dades de confiança massa gran\n"
+
+#: g10/tdbio.c:424
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: no s'ha pogut accedir: %s\n"
+
+#: g10/tdbio.c:438
+#, 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
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: no s'ha pogut crear el bloqueig\n"
+
+#: g10/tdbio.c:473
+#, 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
+#, 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
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: s'ha creat la base de dades de confiança\n"
+
+#: g10/tdbio.c:517
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: base de dades de confiança invàlida\n"
+
+#: g10/tdbio.c:550
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "base de dades de confiança: ha fallat lseek: %s\n"
+
+#: g10/tdbio.c:1243
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: versió de fitxer %d invàlid\n"
+
+#: g10/tdbio.c:1589
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error al llegir el registre lliure: %s\n"
+
+#: g10/tdbio.c:1597
+#, 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
+#, 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
+#, 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
+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"
+
+#: g10/trustdb.c:474
+#, 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"
+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:1812
+#, 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"
+
+#: g10/trustdb.c:1863
+#, c-format
+msgid "lid %lu: dir record w/o key - skipped\n"
+msgstr "lid %lu: registre de directori sense clau - ignorat\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:1875
+#, c-format
+msgid "\t%lu keys skipped\n"
+msgstr "\t%lu claus ignorades\n"
+
+#: g10/trustdb.c:1879
+#, 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"
+
+#: g10/trustdb.c:2228
+msgid "Ooops, no user IDs\n"
+msgstr "Ooops, no hi ha IDs\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: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: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:2407
+#, c-format
+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"
+
+#: 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
+#, 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"
+
+#: g10/verify.c:108
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"no s'ha pogut verificar la signatura.\n"
+"Recordeu que el fitxer de signatura (.sig o .asc)\n"
+"ha de ser el primer que figure en la línia d'ordres.\n"
+
+#: g10/verify.c:173
+#, c-format
+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
+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"
+
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "«%s» ignorat: duplicat\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "«%s» ignorat: %s\n"
+
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr "ignorat: clau secreta ja present\n"
+
+#: g10/skclist.c:160
+#, 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"
+
+#. do not overwrite
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "El fitxer «%s» existeix. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Sobreescriure? (s/N) "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: sufix desconegut\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Introduïu el nou nom del fitxer"
+
+#: g10/openfile.c:184
+msgid "writing to stdout\n"
+msgstr "escrivint en stdout\n"
+
+#: g10/openfile.c:273
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "es supossa que les dades s'han signat amb «%s»\n"
+
+#: g10/openfile.c:323
+#, c-format
+msgid "%s: new options file created\n"
+msgstr "%s: s'ha creat el nou fitxer d'opcions\n"
+
+#: g10/openfile.c:350
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: no s'ha pogut crear el directori: %s\n"
+
+#: g10/openfile.c:353
+#, c-format
+msgid "%s: directory created\n"
+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"
+
+#: g10/encr-data.c:90
+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
+msgid "problem handling encrypted packet\n"
+msgstr "problema al manejar un paquet xifrat\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "s'hi ha creat una clau feble - reintent\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+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
+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
+msgid "Delete this key from the keyring? "
+msgstr "Esborrar aquesta clau de l'anell? "
+
+#: g10/delkey.c:144
+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"
+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"
+msgstr "utilitzeu l'opció «--delete-secret-key» per a eliminar-la primer.\n"
+
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"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 ""
+"L'assignació d'un valor ací és cosa vostra; aquest valor mai s'exportarà\n"
+"a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no te\n"
+"res a veure amb la xarxa de certificats (creada implícitament)."
+
+#: g10/helptext.c:53
+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
+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í»."
+
+#: g10/helptext.c:61
+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
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures.  This is the suggested algorithm because verification of\n"
+"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"
+"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"
+"the signature+encryption flavor.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
+msgstr ""
+"Seleccioneu l'algoritme a utilitzar.\n"
+"\n"
+"DSA (també conegut com DSS) és el algoritme de signatura digital que només\n"
+"pot ser utilitzat per a signatures. Aquest és el algoritme suggerit perque\n"
+"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"
+"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"
+"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
+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"
+"with them are quite large and very slow to verify."
+msgstr ""
+"Encara que aquestes claus estan definides en RFC2440, no es recomanen\n"
+"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
+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
+msgid "Answer \"yes\" or \"no\""
+msgstr "Contesteu «sí» o «no»"
+
+#: g10/helptext.c:106
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Introduïu el valor requerit tal i com es mostra en l'indicatiu.\n"
+"És possible introduir una data USO (AAAA-MM-DD) però no rebreu\n"
+"una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
+"el valor donat com un interval."
+
+#: g10/helptext.c:118
+msgid "Enter the name of the key holder"
+msgstr "Introduïu el nom del propietari de la clau"
+
+#: g10/helptext.c:123
+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
+msgid "Please enter an optional comment"
+msgstr "Introduïu un comentari opcional"
+
+#: g10/helptext.c:132
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  canvia el nom.\n"
+"C  canvia el comentari.\n"
+"E  canvia l'adreça de correu electrònic.\n"
+"O  continua la generació de les claus.\n"
+"Q  ix."
+
+#: g10/helptext.c:141
+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
+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
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
+"Tots els certificats també es perdran!"
+
+#: g10/helptext.c:173
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Contesteu «sí» si és correcte eliminar la subclau"
+
+#: g10/helptext.c:178
+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 ""
+"Aquesta és una signatura vàlida en la clau; normalment no voldreu\n"
+"eliminar aquesta signatura perque pot ser important per a establir\n"
+"una connexió de confiança a la clau o a un altra clau certificada\n"
+"per aquesta clau."
+
+#: g10/helptext.c:183
+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 ""
+"Aquesta signatura no es pot comprovar perque no teniu la clau\n"
+"corresponent. Haurieu de pospossar la seua eliminació fins que\n"
+"sapigueu quina clau es va utilitzar ja que aquesta clau de signatura\n"
+"podria establir una connexió de confiança a través d'una altra clau ja\n"
+"certificada."
+
+#: g10/helptext.c:189
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
+"de claus."
+
+#: g10/helptext.c:193
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"Aquesta és una signatura que enllaça el ID de l'usuari a la clau.\n"
+"Normalment no és una bona idea eliminar una signatura com aquesta.\n"
+"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, així\n"
+"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
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+"  Blurb, blurb,.... "
+msgstr ""
+"Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
+"  Blurb, blurb..."
+
+#: g10/helptext.c:209
+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
+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
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
+
+#: g10/helptext.c:223
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+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
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Haurieu d'especificar una raó per a la certificació. Depenent en el\n"
+"context teniu l'habilitat de triar d'aquesta llista:\n"
+"  «La clau ha estat compromesa»\n"
+"      Utilitzeu açò si teniu alguna raó per a creure que persones no\n"
+"      autoritzades han tingut accés a la vostra clau secreta.\n"
+"  «La clau ha estat reemplaçada»\n"
+"      Utilitzeu açò si heu reemplaçat aquesta clau amb una més nova.\n"
+"  «La clau ja no està en ús»\n"
+"      Utilitzeu açò si heu retirat aquesta clau.\n"
+"  «L'ID de l'usuari ja no és vàlid»\n"
+"      Utilitzeu açò per a constatar que l'ID de l'usuari no s'hauria\n"
+"      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
+msgid ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate.  Please keep this text concise.\n"
+"An empty line ends the text.\n"
+msgstr ""
+"Si voleu podeu introduir un text que descriga per què expediu aquest\n"
+"certificat de revocació. Per favor, sigueu concisos.\n"
+"Una línia buida indica el final del text.\n"
+
+#: g10/helptext.c:260
+msgid "No help available"
+msgstr "No hi ha ajuda disponible"
+
+#: g10/helptext.c:268
+#, c-format
+msgid "No help available for `%s'"
+msgstr "No hi ha ajuda disponible per a `%s'"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "No es poden usar claus RSA en aquesta versió\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "No hi ha clau per a l'usuari\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "No hi ha usuari per a la clau\n"
+
+#~ 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 e0e269a42..e84a84878 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-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 2002-04-20 10:20+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -13,7 +13,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 "VAROVÁNÍ: Pou¾ívaná pamì» není bezpeèná!\n"
 
 #: util/secmem.c:89
@@ -44,7 +45,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 "ukonèit"
 
@@ -271,58 +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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou¾ít pøíkaz stat na `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' není normální soubor - ignoruji\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr "poznámka: soubor random_seed je prázdný\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:369
+#, 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:348
+#: cipher/random.c:377
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu èíst `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr "poznámka: soubor random_seed není aktualizován\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvoøit `%s': %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zavøít `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 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:663
+#: cipher/random.c:692
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -336,7 +338,7 @@ msgstr ""
 "NEPOU®ÍVEJTE JAKÁKOLIV DATA VYTVOØENÁ TÍMTO PROGRAMEM!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -347,7 +349,7 @@ msgstr ""
 "Nedostatek náhodných bajtù. Prosím, pracujte s operaèním systémem, abyste\n"
 "mu umo¾nili získat více entropie (je potøeba %d bajtù).\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -355,169 +357,169 @@ msgstr ""
 "@Pøíkazy:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvoøit podpis"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvoøit podpis v èitelném dokumentu"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "vytvoøit podpis oddìlený od dokumentu"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "¹ifrovat data"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[soubor]|¹ifrovat soubor"
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "¹ifrování pouze se symetrickou ¹ifrou"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "pouze ulo¾ení"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "de¹ifrovat data (implicitnì)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[soubor]|de¹ifrovat soubor"
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "vypsat seznam klíèù"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "vypsat seznam klíèù a podpisù"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "zkontrolovat podpisy klíèù"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klíèù a fingerprintù"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klíèù"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "vytvoøit nový pár klíèù"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "odstranit klíè ze souboru veøejných klíèù"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klíè ze souboru tajných klíèù"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "podepsat klíè"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "podepsat klíè lokálnì"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "podepsat klíè bez mo¾nosti revokace podpisu"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "podepsat klíè lokálnì a bez mo¾nosti\n"
 " revokace podpisu"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klíè"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "vytvoøit revokaèní certifikát"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportovat klíèe"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportovat klíèe na server klíèù"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importovat klíèe ze serveru klíèù"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "vyhledat klíèe na serveru klíèù"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v¹echny klíèe ze serveru klíèù"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importovat/slouèit klíèe"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "vypsat pouze poøadí paketù"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr ""
 "exportovat hodnoty dùvìryhodnosti\n"
 " vlastníka klíèe"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr ""
 "importovat hodnoty dùvìryhodnosti\n"
 " vlastníka klíèe"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "aktualizovat databázi dùvìry"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "neinteraktivní aktualizace databáze dùvìry"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "opravit naru¹enou databázi dùvìry"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Dekódovat ASCII soubor nebo std. vstup"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Zakódovat soubor nebo std. vstup do ASCII"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]|vypi¹ hash"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -527,210 +529,210 @@ msgstr ""
 "Mo¾nosti:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "vytvoø výstup zakódovaný pomocí ASCII"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|JMÉNO|¹ifrovat pro JMÉNO"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|JMÉNO|pou¾ít JMÉNO jako implicitního adresáta"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr ""
 "pou¾ít implicitní klíè jako implicitního\n"
 " adresáta"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou¾ít tento id u¾ivatele pro podepsání\n"
 " nebo de¹ifrování"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit úrovìò komprimace N (0 - ¾ádná\n"
 " komprimace)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "pou¾ít kanonický textový mód"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "pou¾ít jako výstupní soubor"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "s dodateènými informacemi"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "vùbec nepou¾ívat terminál"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "vynutit podpisy verze 3"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "nevynucovat podpisy verze 3"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "vynutit podpisy verze 4"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "nevynucovat podpisy verze 4"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "pro ¹ifrování v¾dy pou¾ít MDC"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "pro ¹ifrování nikdy nepou¾ít MDC"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "neprovádìt ¾ádné zmìny"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "pou¾ijte gpg-agenta"
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "dávkový re¾im: nikdy se na nic neptat"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "automaticky odpovìdìt ANO na vìt¹inu otázek"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "automaticky odpovìdìt NE na vìt¹inu otázek"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "pøidat tento soubor klíèù do seznamu\n"
 " pou¾ívaných souborù klíèù"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "pøidat tento soubor tajných klíèù do seznamu"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "uka¾ ve kterém souboru klíèù je vypsaný klíè"
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|JMÉNO|pou¾ij JMÉNO jako implicitní tajný klíè"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|POÈÍTAÈ|pou¾ij tento server klíèù pro vyhledávání\n"
 " klíèù"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JMÉNO|nastav znakovou sadu terminálu na JMÉNO"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "èíst nastavení ze souboru"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[SOUBOR]|zapi¹ informaci o stavu do SOUBORu"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLÍÈ|úplnì dùvìøovat tomuto klíèi"
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|SOUBOR|nahrát roz¹iøující modul SOUBOR"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emulovat mód popsaný v RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "nastav v¹echny vlastnosti paketù, ¹ifer\n"
 " a hashù jako v OpenPGP"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "nastav v¹echny vlastnosti paketù, ¹ifer\n"
 " a hashù jako v PGP 2.x"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|pou¾ít mód hesla N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|pou¾ít hashovací algoritmus ALG pro hesla"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|pou¾ít ¹ifrovací algoritmus ALG pro hesla"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou¾ít ¹ifrovací algoritmus ALG"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou¾ít hashovací algoritmus ALG"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou¾ít kompresní algoritmus N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "zahodit identifikátor klíèe z ¹ifrovaných\n"
 " paketù"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Zobrazit fotografický ID"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Nezobrazovat fotografický ID"
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Nastavit pøíkazový øádek k prohlí¾ení\n"
 " fotografického ID"
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -738,7 +740,7 @@ msgstr ""
 "@\n"
 "(Pou¾ijte manuálové stránky pro kompletní seznam v¹ech pøíkazù a mo¾ností)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -756,17 +758,17 @@ msgstr ""
 " --list-keys [jména]        vypsat klíèe\n"
 " --fingerprint [jména]      vypsat fingerprinty \n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby oznamte, prosím, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pøipomínky k pøekladu <translations.cs@gnupg.cz>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou¾ití: gpg [mo¾nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -776,7 +778,7 @@ msgstr ""
 "podepsat, ovìøit, ¹ifrovat nebo de¹ifrovat\n"
 "implicitní operace závisí na vstupních datech\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -784,257 +786,277 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "u¾ití: gpg [mo¾nosti]"
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "konfliktní pøíkazy\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 "POZNÁMKA: neexistuje implicitní soubor s mo¾nostmi `%s'\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo¾nostmi `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "ètu mo¾nosti z `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s není platná znaková sada\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "nelze pou¾ít URI serveru klíèù - chyba analýzy URI\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "VAROVÁNÍ: pou¾ívání paralteru %s se nedoporuèuje.\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "neplatný zpùsob reprezentace v ASCII"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "VAROVÁNÍ: pou¾ívání paralteru %s se nedoporuèuje.\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "neplatný soubor klíèù"
+
+#: g10/g10.c:1369
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:1476
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVÁNÍ: %s pøepí¹e %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 "POZNÁMKA: %s není pro normální pou¾ití!\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 "Není dovoleno pou¾ívat %s s %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v módu --pgp2 mù¾ete vytváøet pouze oddìlené podpisy nebo podpisy èitelné "
 "jako text\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 "v módu --pgp2 nelze souèasnì ¹ifrovat a podepisovat\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 "v módu --pgp2 musíte pou¾ít soubor (ne rouru).\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "¹ifrování zpráv v módu --pgp2 vy¾aduje algoritmus 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 "tato zpráva není pro PGP 2.x pou¾itelná\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 "vybraný ¹ifrovací algoritmus je neplatný\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 "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompresní algoritmus musí být v rozmezí %d..%d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "polo¾ka max-cert-depth musí být v rozmezí od 1 do 255\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dùraznì nedoporuèován\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatná implicitní úroveò kontroly; musí být 0, 1, 2 nebo 3\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "neplatné pøedvolby \n"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné pøedvolby \n"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné pøedvolby \n"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné pøedvolby \n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi dùvìry: %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 [jméno souboru]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jméno souboru]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jméno souboru]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [jméno souboru]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jméno souboru]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jméno souboru]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jméno souboru]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jméno souboru]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key id u¾ivatele"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u¾ivatele"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u¾ivatele"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u¾ivatele"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u¾ivatele [pøíkazy]"
 
-#: 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 "nelze otevøít %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] [id u¾ivatele] [soubor s klíèi (keyring)]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[jméno souboru]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Zaènìte psát svou zprávu ...\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 "nelze otevøít `%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 "
@@ -1043,15 +1065,15 @@ msgstr ""
 "jméno mù¾e obsahovat pouze písmena, èíslice, teèky nebo podtr¾ítka a konèit "
 "s '='\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nemù¾e obsahovat ¾ádné kontrolní znaky\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifikaèní politiku je neplatné\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
@@ -1484,7 +1506,7 @@ msgstr "   (%d) RSA (pouze pro ¹ifrování)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (pro ¹ifrování a podpis)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Vá¹ výbìr? "
 
@@ -1493,7 +1515,7 @@ msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Pou¾ití tohoto algoritmu se ji¾ nedoporuèuje - chcete ho pøesto vytvoøit? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Neplatný výbìr.\n"
 
@@ -1733,7 +1755,7 @@ msgstr ""
 "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\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 "heslo není zopakováno správnì; zkuste to znovu"
 
@@ -1826,7 +1848,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Vytvoøení klíèe se nepodaøilo: %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"
@@ -1834,7 +1856,7 @@ msgstr ""
 "klíè byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n"
 "je problém se systémovým èasem)\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"
@@ -1850,87 +1872,87 @@ msgstr "POZNÁMKA: vytvoøení podklíèe pro klíèe v3 není v souladu s OpenPGP\n"
 msgid "Really create? "
 msgstr "Opravdu vytvoøit? "
 
-#: 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 pro tento pøíkaz není platný\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' je ji¾ zakomprimován\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: nemohu otevøít: %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 "chyba pøi vytváøení hesla: %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: VAROVÁNÍ: soubor je prázdný\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 ""
 "v módu --pgp2 mù¾ete ¹ifrovat pouze RSA klíèem o délce 2048 bitù a ménì\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "ètu z `%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 "algoritmus IDEA nelze pou¾ít pro v¹echny klíèe, pro které ¹ifrujete.\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 "POZNÁMKA: v pøedvolbách nenalezen ¹ifrovací algoritmus %d\n"
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s za¹ifrovaný pro: %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 "klíè `%s' nenalezen: %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 "chyba pøi ètení bloku klíèe: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "klíè %08lX: není ve formátu RFC 2440 - pøeskoèeno\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klíè %08lX: není chránìný - pøeskoèeno\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "klíè %08lX: PGP 2.x klíè - pøeskoèeno\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
 
@@ -1961,262 +1983,267 @@ msgstr "pou¾ívám sekundární klíè %08lX místo primárního klíèe %08lX\n"
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klíè %08lX: tajný klíè bez klíèe veøejného - pøeskoèeno\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl pøeskoèen\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu klíèe byly doposud zpracovány\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pøi ètení `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkový poèet zpracovaných klíèù: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      pøeskoèeny nové klíèe: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identifikátorù (user ID): %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importováno: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             beze zmìn: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nové id u¾ivatelù (user ID): %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nové podklíèe: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nové podpisy: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nové revokace klíèù: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pøeètené tajné klíèe: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importované tajné klíèe: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajné klíèe nezmìnìny: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "klíè %08lX: neplatná vazba podklíèe\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 "klíè %08lX: chybí identifikátor u¾ivatele\n"
 
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "klíè %08lX: neexistuje podklíè pro vázání klíèù\n"
+
 # c-format
-#: g10/import.c:544
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "klíè %08lX: pøijat id u¾ivatele '%s',který není podepsán jím samým\n"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klíè %08lX: chybí platný identifikátor u¾ivatele\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mù¾e to být zpùsobeno chybìjícím podpisem klíèe jím samým\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 "klíè %08lX: veøejný klíè nenalezen: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "klíè %08lX: nový klíè - pøeskoèen\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor klíèù (keyring): %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 "zapisuji do '%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 "chyba pøi zápisu souboru klíèù (keyring)  `%s': %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "klíè %08lX: veøejný klíè importován\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klíè %08lX: neodpovídá na¹í kopii\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 "klíè %08lX: nemohu najít originální blok klíèe: %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 "klíè %08lX: nemohu èíst originální blok klíèe: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "klíè %08lX: 1 nový identifikátor u¾ivatele\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "klíè %08lX: %d nových identifikátorù u¾ivatele\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "klíè %08lX: 1 nový podpis\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "klíè %08lX: %d nových podpisù\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "klíè %08lX: 1 nový podklíè\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "klíè %08lX: %d nových podklíèù\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "klíè %08lX: beze zmìn\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "není nastaven implicitní soubor tajných klíèù %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "klíè %08lX: tajný klíè importován\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 "klíè %08lX: je ji¾ v souboru tajných klíèù\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klíè %08lX: nenalezen tajný klíè: %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 ""
 "klíè %08lX: chybí veøejný klíè - nemohu aplikovat revokaèní certifikát\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - zamítnuto\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "klíè %08lX: revokaèní certifikát importován\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klíè %08lX: neexistuje id u¾ivatele pro podpis\n"
 
-#: g10/import.c:941
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "klíè %08lX: nepodporovaný algoritmus veøejného klíèe u u¾ivatelského id \"%s"
 "\"\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr ""
 "klíè %08lX: neplatný podpis klíèe jím samým u u¾ivatelského id \"%s\"\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klíè %08lX: neexistuje podklíè pro vázání klíèù\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "klíè %08lX: nepodporovaný algoritmus veøejného klíèe\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klíè %08lX: neplatná vazba podklíèe\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klíè %08lX: identifikátor u¾ivatele pøeskoèen '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klíè %08lX: podklíè pøeskoèen\n"
@@ -2225,112 +2252,117 @@ msgstr "klíè %08lX: podklíè pøeskoèen\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 "klíè %08lX: podpis není exportovatelný (tøída %02x) - pøeskoèeno\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "klíè %08lX: revokaèní certifikát na ¹patném místì - pøeskoèeno \n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - pøeskoèen\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "klíè %08lX: revokaèní certifikát na ¹patném místì - pøeskoèeno \n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "klíè %08lX: objeven duplikovaný identifikátor u¾ivatele - slouèen\n"
 
-#: g10/import.c:1233
-#, 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 ""
 "VAROVÁNÍ: klíè %08lX mù¾e být revokován: zkou¹ím získat revokaèní klíè %"
 "08lX\n"
 
-#: g10/import.c:1247
-#, 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 ""
 "VAROVÁNÍ: klíè %08lX mù¾e být revokován: revokaèní klíè %08lX nenalezen.\n"
 
-#: g10/import.c:1304
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "klíè %08lX: pøidán revokaèní certifikát\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "klíè %08lX: podpis klíèe jím samým (direct key signature)\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[podpis klíèe jím samým]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 ¹patný podpis\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 ¹patných podpisù\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 podpis neovìøen, proto¾e chybí klíè\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 podpisù neovìøených, proto¾e chybí klíè\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 podpis neovìøen, proto¾e vznikla chyba\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 podpisù neovìøených, proto¾e vznikly chyby\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifikátor u¾ivatele bez platného podpisu jím samým\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifikátorù u¾ivatele bez platného podpisu jím samým\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U¾ivatelské ID \"%s\" je revokováno."
 
-#: 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
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jistý(á), ¾e stále chcete podpsat tento klíè? (a/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 "  Nelze podepsat.\n"
 
-#: 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 "VAROVÁNÍ: soubor `%s' je prázdný\n"
 
-#: g10/keyedit.c:395
+#: g10/keyedit.c:396
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2340,14 +2372,14 @@ msgstr ""
 "je pouze lokální.\n"
 "\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 "Pøejete si jej zmìnit na plnì exportovatelný podpise? (a/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2357,50 +2389,50 @@ msgstr ""
 "je pouze lokální.\n"
 "\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Pøejete si jej zmìnit na plnì exportovatelný podpise? (a/N) "
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" je ji¾ lokálnì podepsán klíèem %08lX\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" je ji¾ podepsán klíèem %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nic k podepsání klíèem %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Platnost klíèe vypr¹ela!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost klíèe vypr¹í %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va¹eho podpisu vypr¹ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:532
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nemù¾ete udìlat OpenPGP podpis klíèe typu PGP 2.x, kdy¾ jste v --pgp2 módu.\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zpùsobilo nepou¾itelnost klíèe v 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"
@@ -2410,27 +2442,27 @@ msgstr ""
 "patøí vý¹e uvedené osobì.\n"
 "Pokud neznáte odpovìï, zadejte \"0\".\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpovím.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Èáseènì jsem to ovìøil(a).%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi peèlivì jsem to ovìøil(a).%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: \""
@@ -2438,33 +2470,33 @@ msgstr ""
 "Jste si jistý(á), ¾e chcete podepsat tento klíè\n"
 "svým klíèem: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "mù¾e to být zpùsobeno chybìjícím podpisem klíèe jím samým\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"
 "Podpis bude oznaèen jako neexportovatelný.\n"
 "\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"
 "Podpis bude oznaèen jako neodvolatelný (non-revocable).\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2473,7 +2505,7 @@ msgstr ""
 "Podpis bude oznaèen jako neexportovatelný.\n"
 "\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2481,7 +2513,7 @@ msgstr ""
 "\n"
 "Podpis bude oznaèen jako neodvolatelný (non-revocable).\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2489,7 +2521,7 @@ msgstr ""
 "\n"
 "Nijak jsem tento klíè neovìøil.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2497,7 +2529,7 @@ msgstr ""
 "\n"
 "Èásteènì jsem ovìøil tento klíè.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2505,33 +2537,33 @@ msgstr ""
 "\n"
 "Velmi peèlivì jsem ovìøil tento klíè.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Skuteènì podepsat? "
 
-#: 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 "podepsání selhalo: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Tento klíè není chránìný.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajné èásti primárního klíèe nejsou dostupné.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Klíè je chránìný.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Není mo¾né editovat tento klíè: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2539,7 +2571,7 @@ msgstr ""
 "Vlo¾te nové heslo (passphrase) pro tento tajný klíè.\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"
@@ -2547,459 +2579,459 @@ msgstr ""
 "Nechcete heslo - to *není* dobrý nápad!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Opravdu to chcete udìlat? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "pøesunuji podpis klíèe na správné místo\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "ukonèit toto menu"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "u"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "ulo¾it"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "ulo¾it a ukonèit"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "ukázat tuto pomoc"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "vypsat seznam klíèù a id u¾ivatelù"
 
-#: 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 "vyberte identifikátor u¾ivatele N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "vyberte sekundární klíè N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "vypsat seznam podpisù"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "podepsat klíè"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "podepsat klíè lokálnì"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "podepsat klíè bez mo¾nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "podepsat klíè lokálnì a  bez mo¾nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "pøidat identifikátor u¾ivatele"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "pøidat fotografický ID"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "smazat identifikátor u¾ivatele"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "pøidat sekundární klíè"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "smazat sekundární klíè"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "addkey"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "pøidat sekundární klíè"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "smazat podpisy"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "zmìnit dobu platnosti"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "oznaèit u¾ivatelské ID jako primární"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "pøepnout mezi vypsáním seznamu tajných a veøejných klíèù"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: 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 "vypsat seznam pøedvoleb (pro experty)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam pøedvoleb (podrobnì)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "nastavit seznam pøedvoleb"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "aktualizovat pøedvolby"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "zmìnit heslo"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "zmìnit dùvìryhodnost vlastníka klíèe"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revokovat sekundární klíè"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "nastavit klíè jako neplatný (disable)"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "nastavit klíè jako platný (enable)"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "ukázat fotografický ID"
 
-#: 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 "nelze provést v dávkovém módu\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "chyba pøi ètení bloku tajného klíèe `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Tajný klíè je dostupný.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Pøíkaz> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Pro provedení této operace je potøeba tajný klíè.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Prosím, nejdøíve pou¾ijte pøíkaz \"toggle\" (pøepnout).\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "Klíè revokován."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Opravdu podepsat v¹echny id u¾ivatele? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápovìda: Vyberte id u¾ivatele k podepsání\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pøíkaz není v módù %s dovolený.\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 "Musíte vybrat alespoò jeden id u¾ivatele.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Nemù¾ete smazat poslední id u¾ivatele!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Opravdu odstranit tento id u¾ivatele? "
 
-#: 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 "Musíte vybrat alespoò jeden klíè.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Opravdu chcete smazat vybrané klíèe? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Opravdu chcete smazat tento klíè? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Opravdu chcete revokovat vybrané klíèe? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Opravdu chcete revokovat tento klíè? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Opravdu aktualizovat pøedvoleby pro vybraný id u¾ivatele? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Opravdu aktualizovat pøedvolby? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Ulo¾it zmìny? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Ukonèit bez ulo¾ení? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajného klíèe selhala: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Klíè nebyl zmìnìn, tak¾e není potøeba jej aktualizovat.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný pøíkaz (zkuste \"help\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Tento klíè mù¾e být revokován %s klíèem %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr "(citlivá informace)"
 
-#: 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  vytvoøen: %s platnost skonèí: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr "dùvìra: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Tento klíè byl oznaèen za neplatný (disabled)"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! podklíè byl revokován: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- nalezena padìlaná revokace\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problém ovìøení revokace: %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
 #, fuzzy
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
@@ -3008,7 +3040,7 @@ msgstr ""
 "Prosím nezapomeòte, ¾e zobrazované údaje o platnosti klíèù nemusí\n"
 "být správné, dokud znova nespustíte program.\n"
 
-#: 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"
@@ -3017,109 +3049,109 @@ msgstr ""
 "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání fotografického ID mù¾e v nìkterých\n"
 "         verzích PGP vést k odmítnutí tohoto klíèe.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jistý, ¾e jej chcete stále pøidat? (a/N) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemìli by jste pøidávat fotografický ID k PGP2 klíèi.\n"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smazán %d podpis.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smazáno %d podpisù.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaznáno.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo¾te délku klíèe"
 
-#: 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 "Prosím, odstraòte výbìr z tajných klíèù.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosím, vyberte nejvý¹e jeden sekundární klíè.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Mìním dobu platnosti sekundárního klíèe.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mìním dobu platnosti primárního klíèe.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemù¾ete zmìnit dobu platnosti klíèe verze 3\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajných klíèù chybí odpovídající podpis\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právì jeden id u¾ivatele .\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 ""
 "klíè %08lX: neplatný podpis klíèe jím samým u u¾ivatelského id \"%s\"\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekundární klíè s indexem %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "id u¾ivatele: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3128,7 +3160,7 @@ msgstr ""
 "\"\n"
 "podepsáno Va¹ím klíèem %08lX v %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -3137,56 +3169,56 @@ msgstr ""
 "\"\n"
 "lokálnì podepsáno Va¹ím klíèem %08lX v %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr¹í %s.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jistý, ¾e jej chcete stále revokovat? (a/N) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoøit pro tento podpis revokaèní certifikát? (a/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Podepsal(a) jste následující identifikátory u¾ivatele:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   podepsáno %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokováno %08lX v %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   podepsáno %08lX v %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (nexeportovatelné)"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "neexistuje tajný klíè\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 ""
@@ -3201,7 +3233,7 @@ msgstr "Podepisovací politika: "
 msgid "Signature policy: "
 msgstr "Podepisovací politika: "
 
-#: 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 "VAROVÁNÍ: nalezen neplatný formát zápisu datumu\n"
 
@@ -3223,165 +3255,174 @@ msgid "Keyring"
 msgstr "soubor klíèù (keyring)"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [platnost skonèí: %s]"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Miniatura (fingerprint):"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "vypsat seznam klíèù a fingerprintù"
 
-#. 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 "             Fingerprint:"
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "   Fingerprint klíèe ="
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "   Fingerprint klíèe ="
+
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "   Fingerprint klíèe ="
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "   Fingerprint klíèe ="
 
-#: 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 za¹ifrovaná data\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 "za¹ifrováno neznámým algoritmem %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "veøejný klíè je %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za¹ifrována veøejným klíèem: správný 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 "za¹ifrována %u-bitovým %s klíèem, ID %08lX, vytvoøeným %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "za¹ifrováno %s klíèem, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de¹ifrování veøeným klíèem selhalo: %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 "pøedpokládám %s ¹ifrovaných dat\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA není dostupný; optimisticky se jej pokusíme nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "de¹ifrování o.k.\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVÁNÍ: se za¹ifrovanou zprávou bylo manipulováno!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de¹ifrování selhalo: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZNÁMKA: odesílatel po¾adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pùvodní jméno souboru='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatný revokaèní certifikát -  pou¾ijte \"gpg --import\", chcete-li jej "
 "u¾ít\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notace: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Politika: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potlaèena\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 "neumím pracovat s tìmito násobnými podpisy\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Podpis vytvoøen %.*s pomocí %s klíèe s identifikátorem u¾ivatele %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "©PATNÝ podpis od \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Podpis s vypr¹enou platností od \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[nejistý]  "
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ovìøit podpis: %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 "toto není podpis oddìlený od dokumentu\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis tøídy 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatný koøenový paket v proc_tree()\n"
 
@@ -3401,13 +3442,13 @@ msgstr ""
 "standardnìj¹í!\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 "VAROVÁNÍ: vlastnictví pro %s nastaveno nebezpeènì \"%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 "VAROVÁNÍ: pøístupová práva pro %s nejsou nastavena bezpeènì \"%s\"\n"
 
 #: g10/misc.c:443
@@ -3470,7 +3511,7 @@ msgstr "¹patný formát promìnné prostøedí GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d není podporován\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 "nemohu se pøipojit k `%s': %s\n"
@@ -3616,42 +3657,41 @@ msgstr "POZNÁMKA: platnost tajného klíèe %08lX skonèila %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "klíè %08lX: klíè byl revokován\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 "po¾aduji klíè %08lX z HKP serveru klíèù %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "nemohu dostat klíè ze serveru klíèù: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "chyba pøi posílání na `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "úspì¹né odeslání na `%s' (status=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "chyba odeslání na `%s': (status=%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 "vyhledávám \"%s\" na HKP serveru %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nemohu prohledávat server klíèù: %s\n"
@@ -3684,29 +3724,29 @@ msgstr ""
 "generuji _nevhodný_ 16-ti bitový kontrolní souèet pro ochranu soukromého "
 "klíèe\n"
 
-#: 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 ""
 "toto je klíè algoritmu ElGamal vygenerovaný v PGP - podpisy jím vytvoøené "
 "NEJSOU bezpeè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 "veøejný klíè je o %lu sekund novìj¹í ne¾ podpis\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 "veøejný klíè je o %lu sekund novìj¹í ne¾ podpis\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "POZNÁMKA: podpisovému klíèi %08lX skonèila platnost %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "pøedpokládám ¹patný podpis, proto¾e je nastaven neznámý kritický bit\n"
 
@@ -4092,33 +4132,37 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po¾aduje pou¾ití 160-ti bitového hashovacího algoritmu\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 "bez parametru \"--yes\" to nemohu v dávkovém módu provést\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Smazat tento klíè ze souboru klíèù? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Toto je tajný klíè! - opravdu smazat? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "smazání bloku klíèe se nezdaøilo:  %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "informace o dùvìryhodnosti vlastníka klíèe vymazány\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajný klíè pro tento veøejný klíè \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou¾ijte nejprve parametr \"--delete-secret-key\".\n"
@@ -4539,6 +4583,12 @@ msgstr "%lu klíèù zkontrolován (%lu podpisù)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: soubor klíèù (keyring) vytvoøen\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Miniatura (fingerprint):"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "             Fingerprint:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|JMÉNO=HODNOTA|pou¾ít tento zápis dat"
 
diff --git a/po/da.po b/po/da.po
index 1ca03380f..a43cb1a1a 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-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,7 +16,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 "Advarsel: benytter ubeskyttet hukommelse!\n"
 
 #: util/secmem.c:89
@@ -47,7 +48,7 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "afslut"
 
@@ -277,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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:369
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:348
+#: cipher/random.c:377
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilfældig-nummer-generator!!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:692
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -342,7 +343,7 @@ msgstr ""
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -353,7 +354,7 @@ msgstr ""
 "Ikke nok tilfældige byte tilgængelig.  Please do some other work to give\n"
 "the OS a chance to collect more entropy! (Kræver %d byte mere)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -361,170 +362,170 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "kryptér data"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "kryptér kun med symmetriske cifre"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "afkryptér data (standard)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "vis nøgler og signaturer"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "tjek nøglesignaturer"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "vis nøgle og fingeraftryk"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "generér et nyt nøglepar"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgle fra den offentlige nøglering"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgle fra den hemmelige nøglering"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "signér en nøgle"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "signér eller redigér en nøgle"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "eksportér nøgler"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "eksportér nøgler til en nøgletjener"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importér nøgler fra en nøgleserver"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksportér nøgler til en nøgletjener"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importér nøgler fra en nøgleserver"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importér/fusionér nøgler"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "eksportér ejertillidsværdierne"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importér ejertillidsværdierne"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "opdatér tillidsdatabasen"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "opdatér tillidsdatabasen"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "reparér en ødelagt tillidsdatabase"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresumé"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -534,204 +535,204 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|kryptér for NAME"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "brug standard nøglen som standard modtager"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sæt kompresningsniveau N (0 = slået fra)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "vær mere stille"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "kørselsmodus: spørg aldrig"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste sprøgsmål"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste sprøgsmål"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "tilføj denne nøglering til nøgleringslisten"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "tilføj denne hemmeligenøglering til listen"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelignøgle"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne nøgletjener til at slå nøgler op"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|sæt terminal karaktersæt til NAME"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "læs indstillinger fra fil"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indlæs udvidelsesmodul FILE"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emulér modusen beskrevet i RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "sæt alle pakker, cifre og resumé flag til OpenPGP standard"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "sæt alle pakker, cifre og resumé flag til OpenPGP standard"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resuméalgoritme NAME for pasfrase"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresumé algoritme NAME"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -751,16 +752,16 @@ msgstr ""
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapportér venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
 # Skal alt dette oversættes eller er det flagene?
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -770,7 +771,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afhænger af inddata\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -778,275 +779,295 @@ msgstr ""
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\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 "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "læser indstillinger fra `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegnsæt\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "ugyldig rustning"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "ugyldig nøglering"
+
+#: 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 ""
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: 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 "NOTITS: %s er ikke til normal brug!\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 ikke tilladt med %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %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 ""
 
-#: 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 ""
 
-#: g10/g10.c:1531
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\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 "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1634
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis præferencer"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis præferencer"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis præferencer"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis præferencer"
 
 # er det klogt at oversætte TrustDB?
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %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 [filnavn (som gemmes)]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: 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 "kan ikke åbne %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] [bruger-id] [nøglering]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\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 "kan ikke åbne `%s'\n"
 
-#: g10/g10.c:2474
+#: g10/g10.c:2509
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1470,7 +1491,7 @@ msgstr "   (%d) ElGamal (kryptér kun)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -1478,7 +1499,7 @@ msgstr "Dit valg? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -1688,7 +1709,7 @@ msgstr ""
 "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:784 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
@@ -1771,13 +1792,13 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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"
@@ -1791,86 +1812,86 @@ msgstr ""
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: 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 ""
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:132 g10/encode.c:357
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: 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: kan ikke åbne: %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 "fejl ved oprettelse af kodesætning: %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: ADVARSEL: tom fil\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 ""
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "læser fra '%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 ""
 
-#: 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
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %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
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:81 g10/export.c:213
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
@@ -1900,257 +1921,262 @@ msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n"
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu nøgler behandlet indtil nu\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undernøgler: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              uændrede: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undernøgler: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye nøgletilbagekald: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige nøgler læst: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige nøgler import: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige nøgler uændre: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr ""
 
-#: 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 "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:544
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n"
+
+#: g10/import.c:663
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: 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 "nøgle %08lX: offentlig nøgle ikke fundet: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af nøglering `%s': %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 "skriver til `%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 "fejl ved skrivning af nøglering `%s': %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nøgle %08lX: stemmer ikke med vores kopi\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 "nøgle %08lX: kan ikke lokalisere original nøgleblok: %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 "nøgle %08lX: kan ikke læse original nøgleblok: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "nøgle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig nøglering\n"
 
-#: g10/import.c:781
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. 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 ""
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:819
+#: g10/import.c:938
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:941
+#: g10/import.c:1060
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -2159,942 +2185,947 @@ msgstr ""
 #. * 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 ""
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: 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 "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "nøgle %08lX: offentlig nøgle importeret\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 dårlig signature\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 dårlige signaturer\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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Nøglen er beskyttet.\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 "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: 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 "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:395
+#: 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:404
+#: 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:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bemærk: Denne nøgle er forældet!\n"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:531
+#: 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:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:556
+#: 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:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 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 ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 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 ""
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: 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 "signering fejlede: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig nøgle ikke tilgængelig"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne nøgle: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:789
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne gøre dette?"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "hjælp"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "vis denne hjælp"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "vis nøgler og bruger-id'er"
 
-#: 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 ""
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "nøgle"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "vælg sekundær nøgle N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "signér"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "signér nøglen"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsignér"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrsign"
 msgstr "signér"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "nrlsign"
 msgstr "signér"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "tilføj-bid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "slet bruger id"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "tilføj nøgle"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "tilføj sekundær nøgle"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "sletnøgle"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "slet sekundær nøgle"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "tilføj nøgle"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilføj sekundær nøgle"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "udløb"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "ændr udløbsdatoen"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig nøgle visning"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "præf"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "showpref"
 msgstr "vispræf"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "setpref"
 msgstr "præf"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "set preference list"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updpref"
 msgstr "præf"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updated preferences"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "ændr kodesætningen"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "slåfra"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "slå nøgle fra"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "slåtil"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "slå nøgle til"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr ""
 
-#: 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 ""
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: 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 ""
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Gem ændringer? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr ""
 
-#: 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 ""
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! undernøgle er blevet annulleret! %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- forkert nøgletilbagekald\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: 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"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast nøglens størrelse"
 
-#: 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 ""
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\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 "nøgle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundær nøgle med indeks %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Generér en annullérbar certifikat"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr ""
 
-#: 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 "Generér en annullérbar certifikat"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr ""
 
-#: 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 ""
@@ -3109,7 +3140,7 @@ msgstr "%s signatur fra: %s\n"
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: 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 ""
 
@@ -3130,161 +3161,170 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Fingeraftryk:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "vis nøgle og fingeraftryk"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "             Fingeraftryk:"
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "             Fingeraftryk:"
 
-#. 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:"
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1010
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: 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 ""
 
-#: 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 ""
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "kryptér data"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr ""
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "DÅRLIG signatur fra \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %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
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -3303,12 +3343,12 @@ msgstr ""
 
 #: g10/misc.c:386
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:418
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:443
@@ -3370,7 +3410,7 @@ msgstr ""
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
@@ -3510,42 +3550,41 @@ msgstr ""
 msgid "NOTE: key has been revoked"
 msgstr "nøgle %08lX: nøgle er blevet annulleret!\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
+#: g10/hkp.c:71
 #, fuzzy, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+msgid "requesting key %08lX from %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
@@ -3578,27 +3617,27 @@ 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 ""
 
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -3970,33 +4009,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 ""
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Slet denne nøgle fra nøgleringen? "
 
-#: 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
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %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 ""
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
@@ -4311,6 +4354,12 @@ msgstr "vis nøgler og signaturer"
 msgid "%s: keyring created\n"
 msgstr ""
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingeraftryk:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "             Fingeraftryk:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NAME=VALUE|brug denne notationsdata"
 
diff --git a/po/de.po b/po/de.po
index b40ebec3c..44d01b574 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,9 +3,9 @@
 # Walter Koch <koch@hsp.de>, 1998, 1999, 2000, 2001
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-04-09 19:41+0200\n"
+"Project-Id-Version: gnupg-1.0.7\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
+"PO-Revision-Date: 2002-08-04 23:22+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,8 +13,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
-msgstr "Warnung: Sensible Daten könnten auf Platte ausgelagert werden.\n"
+msgid "WARNING: using insecure memory!\n"
+msgstr "WARNUNG: Sensible Daten könnten auf Platte ausgelagert werden.\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
@@ -47,7 +47,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
@@ -274,59 +274,58 @@ 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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:340
-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"
+#: cipher/random.c:369
+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"
 
-#: cipher/random.c:348
+#: cipher/random.c:377
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:692
 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 +339,7 @@ msgstr ""
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +351,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +359,163 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[Dateien]|Dateien verschlüsseln"
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[Dateien]|Dateien entschlüsseln"
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "Signaturen der Schlüssel prüfen"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "Schlüssel nicht widerrufbar signieren"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "Schlüssel nur für diesen Rechner und nicht-widerrufbar signieren"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "unbeaufsichtigtes Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer beschädigten \"Trust\"-Datenb."
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-Hülle befreien"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-Hülle einpacken"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,198 +525,198 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "v3 Signaturen nicht erzwingen"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "v4 Signaturen erzwingen"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "v4 Signaturen nicht erzwingen"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "Beim Verschlüsseln niemals ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "den GPG-Agent verwenden"
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[Datei]|Statusinfo in Datei schreiben"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen"
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschlüsselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "alle Paket-, Verschlüsselungs- und\n"
 "Hashoptionen auf PGP 2.X-Verhalten einstellen"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl.verfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "Empfänger-ID verschlüsselter Pakete entfernen"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Foto-IDs anzeigen"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Foto-IDs nicht anzeigen"
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Kommandozeilentext für den Foto-Betrachter setzen"
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -726,7 +725,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -746,17 +745,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -766,7 +765,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten.\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -774,264 +773,276 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/g10.c:810
+#: g10/g10.c:817
 #, c-format
 msgid "no values for group \"%s\"\n"
-msgstr ""
+msgstr "Keine Werte für Gruppe \"%s\"\n"
 
-#: g10/g10.c:997
+#: g10/g10.c:1010
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein gültiger Zeichensatz.\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: ungültige Import Option.\n"
+
+#: g10/g10.c:1353
+msgid "invalid import options\n"
+msgstr "Ungültige Import Option\n"
+
+#: g10/g10.c:1360
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: ungültige Export Option.\n"
+
+#: g10/g10.c:1363
+msgid "invalid export options\n"
+msgstr "Ungültige export Option\n"
+
+#: g10/g10.c:1369
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:1476
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %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 "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\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 kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1549
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
 "machen\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 ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
 "verschlüsseln\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 ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\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 "Diese Botschaft könnte für PGP 2.x unbrauchbar sein\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 "Das ausgewählte Verschlüsselungsverfahren ist ungültig\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 "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:1613
-#, fuzzy
+#: g10/g10.c:1647
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren muß im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\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 muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-check-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:1651
-#, fuzzy
+#: g10/g10.c:1685
 msgid "invalid default preferences\n"
-msgstr "ungültige Voreinstellungen\n"
+msgstr "ungültige Standard Voreinstellungen\n"
 
-#: g10/g10.c:1659
-#, fuzzy
+#: g10/g10.c:1693
 msgid "invalid personal cipher preferences\n"
-msgstr "ungültige Voreinstellungen\n"
+msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/g10.c:1663
-#, fuzzy
+#: g10/g10.c:1697
 msgid "invalid personal digest preferences\n"
-msgstr "ungültige Voreinstellungen\n"
+msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:1667
-#, fuzzy
+#: g10/g10.c:1701
 msgid "invalid personal compress preferences\n"
-msgstr "ungültige Voreinstellungen\n"
+msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1771
+#: g10/g10.c:1805
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
+msgstr "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:1781
+#: g10/g10.c:1815
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: 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 "'%s' kann nicht geöffnet werden: %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] [User-ID] [Schlüsselbund]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\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 "'%s' kann nicht geöffnet werden\n"
 
-#: g10/g10.c:2474
-#, fuzzy
+#: g10/g10.c:2509
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1039,15 +1050,15 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
@@ -1147,12 +1158,10 @@ msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
@@ -1429,9 +1438,8 @@ msgid "invalid character in preference string\n"
 msgstr "Ungültiges Zeichen in den Voreinstellungen\n"
 
 #: g10/keygen.c:524
-#, fuzzy
 msgid "writing direct signature\n"
-msgstr "Die Eigenbeglaubigung wird geschrieben\n"
+msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
 #: g10/keygen.c:563
 msgid "writing self signature\n"
@@ -1490,7 +1498,7 @@ msgstr "   (%d) RSA (nur verschlüsseln)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
@@ -1499,7 +1507,7 @@ msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
@@ -1734,7 +1742,7 @@ msgstr ""
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\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 "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
 
@@ -1827,7 +1835,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %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"
@@ -1835,7 +1843,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\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"
@@ -1851,90 +1859,90 @@ msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: 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 funktioniert nicht bei diesem Kommando\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' ist bereits komprimiert\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: kann nicht geöffnet werden: %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 "Fehler beim Erzeugen des Mantras: %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: WARNUNG: Leere Datei\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 ""
 "Im --pgp2-Modus kann nur für RSA-Schlüssel mit maximal 2048 Bit "
 "verschlüsselt werden\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%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 ""
 "Die IDEA-Verschlüsselung kann nicht mit allen Zielschlüsseln verwendet "
 "werden.\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 ""
+msgstr "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:485 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:491 g10/sign.c:758
+#, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
+msgstr "Erzwungenes Kompressionsverfahren %s (%d) verletzt die Empfängervoreinstellungen.\n"
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschlüsselt für: %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 "Schlüssel `%s' nicht gefunden: %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 "Fehler beim Lesen des Schlüsselblocks: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "Schlüssel %08lX: dies ist kein RFC2440-Schüssel - übersprungen\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "Schlüssel %08lX: PGP 2.x-artiger Schlüssel - übersprungen\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
@@ -1967,264 +1975,269 @@ msgstr ""
 "Schlüssel %08lX: geheimer Schlüssel, aber ohne öffentlichen Schlüssel - "
 "übersprungen\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schlüssel: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unverändert: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschlüssel: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unveränderte geh.Schl.: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
+#: g10/import.c:593
+#, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n"
+msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung entfernt\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 "Schlüssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:544
+#: g10/import.c:648
+#, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "Schlüssel %08lX: HKP Unterschlüsseldefekt repariert\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\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 "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %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 "Schreiben nach '%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 "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
+#: g10/import.c:715
+#, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "Schlüssel %08lX: Öffentlicher Schlüssel importiert\n"
+msgstr "Schlüssel %08lX: Öffentlicher Schlüssel \"%s\" importiert\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schlüssel %08lX: Stimmt nicht mit unserer Kopie überein\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 ""
 "Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: %"
 "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 ""
 "Schlüssel %08lX: Lesefehler im lokalen originalen Schlüsselblocks: %s\n"
 
-#: g10/import.c:673
-#, fuzzy, c-format
+#: g10/import.c:792
+#, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "Schlüssel %08lX: 1 neue User-ID\n"
+msgstr "Schlüssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
+#: g10/import.c:795
+#, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "Schlüssel %08lX: %d neue User-IDs\n"
+msgstr "Schlüssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
+#: g10/import.c:798
+#, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "Schlüssel %08lX: 1 neue Signatur\n"
+msgstr "Schlüssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
+#: g10/import.c:801
+#, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "Schlüssel %08lX: %d neue Signaturen\n"
+msgstr "Schlüssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
+#: g10/import.c:804
+#, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "Schlüssel %08lX: 1 neuer Unterschlüssel\n"
+msgstr "Schlüssel %08lX: \"%s\" 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
+#: g10/import.c:807
+#, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "Schlüssel %08lX: %d neue Unterschlüssel\n"
+msgstr "Schlüssel %08lX: \"%s\" %d neue Unterschlüssel\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
+#: g10/import.c:819
+#, c-format
 msgid "key %08lX: \"%s\" not changed\n"
-msgstr "Schlüssel %08lX: Nicht geändert\n"
+msgstr "Schlüssel %08lX: \"%s\" Nicht geändert\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schlüssel %08lX: Geheimer Schlüssel importiert\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 "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schlüssel %08lX: geheimer Schlüssel nicht gefunden: %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 ""
 "Schlüssel %08lX: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:891
-#, fuzzy, c-format
+#: g10/import.c:1010
+#, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "Schlüssel %08lX: Widerrufzertifikat importiert\n"
+msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "Schlüssel %08lX: Keine User-ID für Signatur\n"
 
-#: g10/import.c:941
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schlüssel %08lX: Kein Unterschlüssel für die Schlüsselanbindung\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schlüssel %08lX: User-ID übergangen '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n"
@@ -2233,130 +2246,130 @@ msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\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 ""
 "Schlüssel %08lX: Nicht exportfähige Unterschrift (Klasse %02x) - übergangen\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %08lX: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:1233
+#: 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"
+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"
 
-#: g10/import.c:1247
+#: 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"
+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"
 
-#: g10/import.c:1304
-#, fuzzy, c-format
+#: g10/import.c:1436
+#, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "Schlüssel %08lX: Widerrufzertifikat hinzugefügt\n"
+msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "Schlüssel %08lX: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\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 falsche Beglaubigungen\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 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\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 Beglaubigungen wegen fehlenden Schlüsseln nicht geprüft\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 Beglaubigung aufgrund von Fehler nicht geprüft\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 Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: 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
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/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 "  Beglaubigen ist nicht möglich.\n"
 
-#: g10/keyedit.c:376
+#: g10/keyedit.c:377
 #, c-format
-msgid "Warning: user ID \"%s\" is not self-signed.\n"
-msgstr ""
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "WARNUNG: User-ID \"%s\" ist nicht eigenbeglaubigt.\n"
 
-#: g10/keyedit.c:395
-#, fuzzy, c-format
+#: g10/keyedit.c:396
+#, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"Die derzeitige Beglaubigung von \"%s\"\n"
-"ist nur für diesen Rechner gültig.\n"
+"Die Eigenbeglaubigung von \"%s\"\n"
+"ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:404
-#, fuzzy
+#: g10/keyedit.c:405
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr ""
-"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
+msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2365,40 +2378,40 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur für diesen Rechner gültig.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen für Schlüssel %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Dieser Schlüssel ist verfallen!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schlüssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:532
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2406,11 +2419,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies würde den Schlüssel für PGP 2.x unbrauchbar machen\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"
@@ -2420,27 +2433,27 @@ msgstr ""
 "wollen, wirklich der o.g. Person gehört?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es überhaupt nicht überprüft.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es flüchtig überprüft.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgfältig überprüft.%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: \""
@@ -2448,32 +2461,25 @@ msgstr ""
 "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
 "Schlüssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:600
-#, fuzzy
+#: g10/keyedit.c:601
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
+msgstr "\nDies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:605
 msgid ""
 "\n"
-"Warning: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"Die Unterschrift wird als nicht exportfähig markiert werden.\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr "\nWARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert werden.\n"
 
-#: g10/keyedit.c:609
-#, fuzzy
+#: g10/keyedit.c:610
 msgid ""
 "\n"
-"Warning: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"Die Unterschrift wird als nicht exportfähig markiert werden.\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr "\nDie Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2481,7 +2487,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2489,7 +2495,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2497,7 +2503,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2505,7 +2511,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schlüssel flüchtig überprüft.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2513,33 +2519,33 @@ msgstr ""
 "\n"
 "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: 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 "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schlüssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2547,7 +2553,7 @@ msgstr ""
 "Geben Sie das neue Mantra für diesen geheimen Schlüssel ein.\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"
@@ -2555,461 +2561,458 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Möchten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "Liste der Schlüssel"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: 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 "User-ID N auswählen"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "Zweitschlüssel N auswählen"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "Den Schlüssel signieren"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "Den Schlüssel nur für diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "Den Schlüssel nicht-widerrufbar beglaubigen"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "Den Schlüssel nicht-widerrufbar und nur für diesen Rechner signieren"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "Einen Zweitschlüssel hinzufügen"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "Einen Zweitschlüssel entfernen"
 
-#: g10/keyedit.c:922
-#, fuzzy
+#: g10/keyedit.c:923
 msgid "addrevoker"
-msgstr "widerrufen"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:922
-#, fuzzy
+#: g10/keyedit.c:923
 msgid "add a revocation key"
-msgstr "Einen Zweitschlüssel hinzufügen"
+msgstr "Einen Widerrufschlüssel hinzufügen"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "Ändern des Verfallsdatums"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: 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 "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "geänderte Voreinstellungen"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "Das Mantra ändern"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschlüssel widerrufen"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: 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 "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Fehler beim Lesen des geheimen Schlüsselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\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 "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: 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 "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Die Voreinstellungen wirklich ändern? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Änderungen speichern? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
+#: g10/keyedit.c:1747
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Dieser Schlüssel könnte von %s key %s%s widerrufen worden sein\n"
+msgstr "Dieser Schlüssel könnte widerrufen worden sein von %s Schlüssel "
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
-#: 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  erstellt: %s verfällt: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschlüssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- gefälschter Schlüsselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-Überprüfung: %s\n"
 
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:1834
 msgid "There are no preferences on a PGP 2.x-style key.\n"
-msgstr ""
+msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:1835
-#, fuzzy
+#: g10/keyedit.c:1842
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3017,7 +3020,7 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: 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"
@@ -3027,108 +3030,107 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch hinzufügen? (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 "Sie können einem PGP2-artigen Schlüüsel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
+#: g10/keyedit.c:2210
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Wählen Sie die gewünschte Schlüssellänge"
+msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2218
+#: g10/keyedit.c:2225
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+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:2228
+#: g10/keyedit.c:2235
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
+msgstr "Ein Schlüssel kann nicht als sein eigener designierter Widerrufer agieren\n"
 
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:2322
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, fuzzy, c-format
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
+msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3137,7 +3139,7 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -3146,78 +3148,76 @@ msgstr ""
 "\"\n"
 "lokal unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\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 ""
 "Anzeigen einer %s Photo ID (%ld Byte) für Schlüssel %08lX (User-ID %d)\n"
 
 #: g10/keylist.c:91
-#, fuzzy
 msgid "Critical signature policy: "
-msgstr "Beglaubigungsrichtlinie: "
+msgstr "Krititische Beglaubigungsrichtlinie: "
 
 #: g10/keylist.c:93
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: 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 "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
 #: g10/keylist.c:127
-#, fuzzy
 msgid "Critical signature notation: "
-msgstr "Beglaubigungs-\"Notation\": "
+msgstr "Krititische Beglaubigungs-\"Notation\": "
 
 #: g10/keylist.c:129
 msgid "Signature notation: "
@@ -3232,162 +3232,167 @@ msgid "Keyring"
 msgstr "Schlüsselbund"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verfällt: %s]"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Fingerabdruck:"
+#: g10/keylist.c:995
+msgid "Primary key fingerprint:"
+msgstr "Haupt-Fingerabdruck  ="
 
-#. 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 "           Fingerabdruck:"
+#: g10/keylist.c:997
+msgid "     Subkey fingerprint:"
+msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1004
+msgid " Primary key fingerprint:"
+msgstr " Haupt-Fingerabdruck  ="
+
+#: g10/keylist.c:1006
+msgid "      Subkey fingerprint:"
+msgstr " Unter-Fingerabdruck  ="
+
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr " Schl.-Fingerabdruck ="
 
-#: 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 verschlüsselte Daten\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 "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "Öffentlicher Schlüssel ist %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte 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 "verschlüsselt mit %u-Bit %s Schlüssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %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 "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\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 "diese Mehrfachunterschriften können nicht behandelt werden\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %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 "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
@@ -3406,13 +3411,13 @@ msgstr "Es ist davon abzuraten, diese Verschlüsselungsmethode zu benutzen!\n"
 
 #: g10/misc.c:386
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr "Warnung: Unsicheres Besitzverhältnis von %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverhältnis von %s \"%s\"\n"
 
 #: g10/misc.c:418
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "Warnung: Unsichere Zugriffsrechte für %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
 
 #: g10/misc.c:443
 msgid "the IDEA cipher plugin is not present\n"
@@ -3424,19 +3429,19 @@ msgid ""
 msgstr "Für weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
 
 #: g10/misc.c:652
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "WARNUNG: %s ist eine mißbilligte Option.\n"
+msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
 #: g10/misc.c:656
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "WARNUNG: %s ist eine mißbilligte Option.\n"
+msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
 #: g10/misc.c:658
-#, fuzzy, c-format
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "Bitte benutzen Sie stattdessen \"--keyserver-options %s\".\n"
+msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
 #: g10/parse-packet.c:120
 #, c-format
@@ -3473,7 +3478,7 @@ msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\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 "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
@@ -3615,46 +3620,44 @@ msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n"
 
 #: g10/pubkey-enc.c:249
-#, fuzzy
 msgid "NOTE: key has been revoked"
-msgstr "Schlüssel %08lX: Schlüssel wurde widerrufen\n"
+msgstr "Hinweis: Schlüssel wurde widerrufen"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
+#: g10/hkp.c:71
 #, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
-msgstr "Schlüssel %08lX wird von HKP-Schlüsselserver %s angefordert\n"
+msgid "requesting key %08lX from %s\n"
+msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "Schlüssel ist beim Schlüsselserver nicht erhältlich: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Senden an `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
 
-#: g10/hkp.c:283
+#: g10/hkp.c:287
 msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
+msgstr "Dieser Schlüsselserver ist nicht vollständig HKP kompatibel\n"
 
-#: g10/hkp.c:493
+#: g10/hkp.c:497
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kann Schlüsselserver nicht durchsuchen: %s\n"
@@ -3689,41 +3692,39 @@ msgstr ""
 "Die mißbilligte 16-bit Prüfsumme wird zum Schutz des geheimen Schlüssels "
 "benutzt\n"
 
-#: 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 ""
 "Dieser durch PGP erzeugte ElGamal-Schlüssel ist für Signaturen NICHT sicher "
 "genug!\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 ""
 "Öffentlicher Schlüssel ist um %lu Sekunde jünger als die Unterschrift\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 ""
 "Öffentlicher Schlüssel ist um %lu Sekunden jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "Hinweis: Signaturschlüssel %08lX ist am %s verfallen.\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
 
 #: g10/sign.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr ""
-"WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
-"\"unerweiterte\".\n"
+msgstr "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende \"unerweiterte\".\n"
 
 #: g10/sign.c:151
 #, c-format
@@ -3749,11 +3750,8 @@ msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
 #: g10/sign.c:644
-#, fuzzy
 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 unterschrieben "
-"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,9 +3759,9 @@ msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
 #: g10/sign.c:690
-#, fuzzy, c-format
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
+msgstr "Erzwingen des Hashverfahrens %s (%d) verletzt die Empfängervoreinstellungen\n"
 
 #: g10/sign.c:784
 msgid "signing:"
@@ -4110,34 +4108,38 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n"
 
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(es sei denn, Sie geben den Schlüssel mittels Fingerprint an)\n"
+
+#: g10/delkey.c:126
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgeführt werden.\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Diesen Schlüssel aus dem Schlüsselbund löschen? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater Schlüssel! - Wirklich löschen? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "Der \"Ownertrust\" wurde gelöscht\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 "Es gibt einen privaten Schlüssel zu diesem öffentlichen Schlüssel \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "Verwenden Sie zunächst das Kommando \"--delete-secret-key\", um ihn zu "
@@ -4245,6 +4247,10 @@ msgid ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
+"Normalerweise ist es nicht gut, denselben Schlüssel zum unterschreiben\n"
+"und verschlüsseln zu nutzen.  Dieses Verfahren sollte in speziellen\n"
+"Anwendungsgebiten benutzt werden.  Bitte lassen Sie sich zuerst von \n"
+"einem Sicherheistexperten beraten."
 
 #: g10/helptext.c:105
 msgid "Enter the size of the key"
@@ -4586,6 +4592,12 @@ msgstr "%lu Schlüssel geprüft (%lu Beglaubigungen)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingerabdruck:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "           Fingerabdruck:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NAME=WERT|diese \"notation\"-Daten verwenden"
 
diff --git a/po/el.po b/po/el.po
index 343bec10b..6e8146777 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-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 2002-04-29 13:24+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\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 "Ðñïåéäïðïßçóç: ÷ñÞóç ìç áóöáëïýò ìíÞìçò\n"
 
 #: util/secmem.c:89
@@ -45,7 +46,7 @@ msgstr "ü÷é"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "ôåñìáôéóìüò"
 
@@ -272,60 +273,61 @@ msgstr "... áõôü åßíáé bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "âñÞêáôå Ýíá bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:353
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "áäõíáìßá ëÞøçò ðëçñïöïñéþí ãéá ôï `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' äåí åßíáé êáíïíéêü áñ÷åßï - áãíïÞèçêå\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 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:369
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ðñïåéäïðïßçóç: ìç Ýãêõñï ìÝãåèïò áñ÷åßïõ random_seed - äåí èá "
 "÷ñçóéìïðïéçèåß\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:377
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "áäõíáìßá áíÜãíùóçò ôïõ `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr "óçìåßùóç: äåí Ý÷åé áíáíåùèåß ôï áñ÷åßï random_seed\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "áäõíáìßá åããñáöÞò ôïõ `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "áäõíáìßá êëåéóßìáôïò ôïõ `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ÷ñÞóç ìç áóöáëïýò ãåííÞôñéáò ôõ÷áßùí áñéèìþí!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:692
 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 ""
 "ÌÇ ×ÑÇÓÉÌÏÐÏÉÇÓÅÔÅ ÄÅÄÏÌÅÍÁ ÐÏÕ Å×ÏÕÍ ÐÁÑÁ×ÈÅÉ ÁÐÏ ÁÕÔÏ ÔÏ ÐÑÏÃÑÁÌÌÁ!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +352,7 @@ msgstr ""
 "íá áðáó÷ïëåßôå ôï ëåéôïõñãéêü óýóôçìá ìÝ÷ñé áõôü íá óõãêåíôñþóåé\n"
 "ðåñéóóüôåñç åíôñïðßá! (×ñåéÜæïíôáé %d ðåñéóóüôåñá bytes)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +360,163 @@ msgstr ""
 "@ÅíôïëÝò:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò õðïãñáöÞò"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[áñ÷åßï]|äçìéïõñãßá ìéáò ìç êñõðôïãñáöçìÝíçò õðïãñáöÞò"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "êñõðôïãñÜöçóç äåäïìÝíùí"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[áñ÷åßá]|êñõðôïãñÜöçóç áñ÷åßùí"
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "êñõðôïãñÜöçóç ìå ÷ñÞóç ìüíï óõììåôñéêþí áëãïñßèìùí"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "áðïèÞêåõóç ìüíï"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "áðïêñõðôïãñÜöçóç äåäïìÝíùí (ðñïêáèïñéóìÝíï)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[áñ÷åßá]|áðïêñõðôïãñÜöçóç áñ÷åßùí"
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "åðáëÞèåõóç ìéáò õðïãñáöÞò"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé õðïãñáöþí"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "Ýëåã÷ïò õðïãñáöÞò êëåéäéïý"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé áðïôõðùìÜôùí (fingerprints)"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "áðåéêüíéóç ôçò ëßóôáò ìõóôéêþí êëåéäéþí"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "áöáßñåóç ôùí êëåéäéþí áðü ôç äçìüóéá êëåéäïèÞêç"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "áöáßñåóç ôùí êëåéäéþí áðü ôç ìõóôéêÞ êëåéäïèÞêç"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý ôïðéêÜ"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý ìç-áíáêáëÝóéìá"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "õðïãñáöÞ åíüò êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "õðïãñáöÞ Þ åðåîåñãáóßá åíüò êëåéäéïý"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "åîáãùãÞ êëåéäéþí"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "åîáãùãÞ êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "åéóáãùãÞ êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "áíáæÞôçóç êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "áíáíÝùóç üëùí ôùí êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "åéóáãùãÞ/óõã÷þíåõóç êëåéäéþí"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "áðåéêüíéóç ìüíï ôçò áêïëïõèßáò ðáêÝôùí"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "åîáãùãÞ ôùí ôéìþí åìðéóôïóýíçò"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "åéóáãùãÞ ôùí ôéìþí åìðéóôïóýíçò"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "áíáíÝùóç ôçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "áíáíÝùóç ôçò ðáñáìåëåéìÝíçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "äéüñèùóç ìéáò öèáñìÝíçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Áöáßñåóç-ÈùñÜêéóçò åíüò áñ÷åßïõ Þ stdin"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "ÐñïóèÞêç-ÈùñÜêéóçò åíüò áñ÷åßïõ Þ stdin"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|áëãüñ [áñ÷åßá]| áðåéêüíéóç ðåñéëÞøåùí ôùí ìçíõìÜôùí"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,195 +526,195 @@ msgstr ""
 "ÅðéëïãÝò:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "äçìéïõñãßá ascii èùñáêéóìÝíçò åîüäïõ"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|ÏÍÏÌÁ|êñõðôïãñÜöçóç ãéá ÏÍÏÌÁ"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç ôïõ ÏÍÏÌÁôïò ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "÷ñÞóç ôïõ ðñïêáèïñéóìÝíïõ êëåéäéïý ùò ðñïêáèïñéóìÝíïõ ðáñáëÞðôç"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "÷ñÞóç áõôÞò ôçò ôáõôüôçôáò (user id) ãéá õðïãñáöÞ Þ áðïêñõðôïãñÜöçóç"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|êáèïñéóìüò åðéðÝäïõ óõìðßåóçò N (0 áðåíåñãïðïéåß)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "÷ñÞóç êáíïíéêÞò êáôÜóôáóçò êåéìÝíïõ"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "÷ñÞóç ùò áñ÷åßïõ åîüäïõ"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "áíáëõôéêÜ"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "Þóõ÷ç Ýîïäïò"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "ìç ÷ñÞóç ôåñìáôéêïý"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "åîáíáãêáóìüò ÷ñÞóçò v3 õðïãñáöþí"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "ü÷é åîáíáãêáóìüò ÷ñÞóçò v3 õðïãñáöþí"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "åîáíáãêáóìüò ÷ñÞóçò v4 õðïãñáöþí"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "ü÷é åîáíáãêáóìüò ÷ñÞóçò v4 õðïãñáöþí"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "÷ñÞóç ðÜíôïôå MDC ãéá êñõðôïãñÜöçóç"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "ðïôÝ ÷ñÞóç MDC ãéá êñõðôïãñÜöçóç"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "íá ìç ãßíåé êáììßá áëëáãÞ"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "÷ñÞóç ôïõ gpg-agent"
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "êáôÜóôáóç batch: íá ìç ãßíïíôáé åñùôÞóåéò"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "áðÜíôçóç íáé óôéò ðåñéóóüôåñåò åñùôÞóåéò"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "áðÜíôçóç ü÷é óôéò ðåñéóóüôåñåò åñùôÞóåéò"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "ðñïóèÞêç áõôïý ôïõ êëåéäéïý óôç ëßóôá ôùí êëåéäïèçêþí"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "ðñïóèÞêç áõôÞò ôçò ìõóôéêÞò êëåéäïèÞêçò óôç ëßóôá"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "áðåéêüíéóç ôçò êëåéäïèÞêçò óôçí ïðïßá áíáöÝñåôå ôï êëåéäß"
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç ÏÍÏÌÁôïò óáí ðñïêáèïñéóìÝíï ìõóôéêü êëåéäß"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ÄÉÁÊÏÌÉÓÔÇÓ|÷ñÞóç áõôïý ôïõ äéáêïìéóôÞ êëåéäéþí ãéá áíáæÞôçóç"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|ÏÍÏÌÁ|êáèïñéóìüò ôïõ óåô ÷áñáêôÞñùí ôåñìáôéêïý óå ÏÍÏÌÁ"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "áíÜãíùóç åðéëïãþí áðü áñ÷åßï"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|åããñáöÞ ôùí ðëçñïöïñéþí êáôÜóôáóçò óôï FD"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[áñ÷åßï]|åããñáöÞ ôùí ðëçñïöïñéþí êáôÜóôáóçò óôï áñ÷åßï"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|áðüëõôç åìðéóôïóýíç óå áõôü ôï êëåéäß"
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|ÁÑ×ÅÉÏ|öüñôùìá ôïõ áñèñþìáôïò åðÝêôáóçò ÁÑ×ÅÉÏ"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "åîïìïßùóç ôçò êáôÜóôáóçò ðïõ ðåñéãñÜöåôáé óôï RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "óõìðåñéöïñÜ üëùí ôùí åðéëïãþí ðáêÝôá,áëãüñéèìïé êáé ðåñßëçøç óå OPENPGP"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "ïñéóìüò üëùí ôùí åðéëïãþí ðáêÝôá,áëãüñéèìïé,ðåñßëçøç óå PGP 2.x óõìðåñéöïñÜ"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|÷ñÞóç ôçò êáôÜóôáóçò öñÜóçò êëåéäß N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|ONOMA|÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò ìçíýìáôïò ÏÍÏÌÁ ãéá öñÜóåéò êëåéäéÜ"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ êñõðôïãñÜöçóçò ÏÍÏÌÁ ãéá öñÜóåéò êëåéäéÜ"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ êñõðôïãñÜöçóçò ÏÍÏÌÁ"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ÏÍÏÌÁ|÷ñÞóç áëãüñéèìïõ ðåñßëçøçò ìçíýìáôïò ÏÍÏÌÁ "
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|÷ñÞóç áëãïñßèìïõ óõìðßåóçò N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "äéáãñáöÞ ôïõ ðåäßïõ keyid ôùí êñõðôïãñáöçìÝíùí ðáêÝôùí"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Áðåéêüíéóç ôùí Photo ID"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Ìç áðåéêüíéóç ôùí Photo ID"
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Ïñéóìüò ôçò ãñáììÞò åíôïëþí ãéá áðåéêüíéóç ôùí Photo ID"
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -720,7 +722,7 @@ msgstr ""
 "@\n"
 "(äåßôå ôç óåëßäá man ãéá ìéá ðëÞñç ëßóôá åíôïëþí êáé åðéëïãþí)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -740,15 +742,15 @@ msgstr ""
 " --list-keys [ïíüìáôá]        áðåéêüíéóç êëåéäéþí\n"
 " --fingerprint [ïíüìáôá]      áðåéêüíéóç áðïôõðùìÜôùí (fingerprints)\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "ÁíáöÝñåôå ôá ðñïâëÞìáôá óôï <gnupg-bugs@gnu.org>\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -758,7 +760,7 @@ msgstr ""
 "õðïãñáöÞ, Ýëåã÷ïò, êñõðôïãñÜöçóç Þ áðïêñõðôïãñÜöçóç\n"
 "ç ðñïêáèïñéóìÝíç ëåéôïõñãßá åîáñôÜôáé áðü ôá äåäïìÝíá åéóüäïõ\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -766,259 +768,279 @@ msgstr ""
 "\n"
 "Õðïóôçñéæüìåíïé áëãüñéèìïé:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "÷ñÞóç: gpg [åðéëïãÝò] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "óõãêñïõüìåíåò åíôïëÝò\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 "ÓÇÌÅÉÙÓÇ:ìç ðñïêáèïñéóìÝíï áñ÷åßï åðéëïãþí `%s'\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "áñ÷åßï åðéëïãþí `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\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' åßíáé ìéá ìç óõíåéóôþìåíç åðéëïãÞ\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "ìç Ýãêõñç êëåéäïèÞêç"
+
+#: g10/g10.c:1369
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n"
 
-#: g10/g10.c:1476
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %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 "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\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 äåí åðéôñÝðåôáé ìå ôï %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %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 ""
 "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --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 ""
 "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --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 "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. 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 "áõôü ôï ì'çíõìá ßóùò äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ìå 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 "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\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 "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ï áëãüñéèìïò óõìðßåóçò ðñÝðåé íá åßíáé ìåôáîý %d..%d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 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 ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n"
 
-#: g10/g10.c:1645
+#: 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:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %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 [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [åíôïëÝò]"
 
-#: 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 "áäõíáìßá ðñüóâáóçò ôïõ %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] [user-id] [êëåéäïèÞêç]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "èùñÜêéóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ìç Ýãêõñïò áëãüñéèìïò  hash `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:2257
+#: 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: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 "áäõíáìßá ðñüóâáóçò ôïõ `%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 "
@@ -1027,15 +1049,15 @@ msgstr ""
 "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï áëöáñéèìçôéêÜ, ôåëåßåò Þ "
 "underscores êáé ëÞãåé ìå '='\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "ç ôéìÞ óçìåßùóçò ðñÝðåé íá ìç ÷ñçóéìïðïéåß ÷áñáêôÞñåò control\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 msgid "the given certification policy URL is invalid\n"
 msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 msgid "the given signature policy URL is invalid\n"
 msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
 
@@ -1472,7 +1494,7 @@ msgstr "   (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (õðïãñáöÞ êáé êñõðôïãñÜöçóç)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Ç åðéëïãÞ óáò; "
 
@@ -1481,7 +1503,7 @@ msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Ç ÷ñÞóç áõôïý ôïõ áëãüñéèìïõ áðïäïêéìÜæåôáé - óßãïõñá íá äçìéïõñãçèåß; "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ìç Ýãêõñç åðéëïãÞ.\n"
 
@@ -1721,7 +1743,7 @@ msgstr ""
 "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\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 "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ"
 
@@ -1815,7 +1837,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %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"
@@ -1823,7 +1845,7 @@ msgstr ""
 "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôï óôï ìÝëëïí (÷ñïíïäßíç Þ\n"
 "áðëþò ðñüâëçìá óôï ñïëüé)\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"
@@ -1841,90 +1863,90 @@ msgstr ""
 msgid "Really create? "
 msgstr "Óßãïõñá íá äçìéïõñãçèåß; "
 
-#: 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 äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\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' Þäç óõìðéÝóôçêå\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: áäõíáìßá ðñüóâáóçò ôïõ: %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 "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %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: ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Üäåéï áñ÷åßï\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 ""
 "êñõðôïãñÜöçóç ìå êëåéäßá RSA áðü 2048 bit Þ ðéï ëßãï ìüíï óå êáôÜóôáóç --"
 "pgp2\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "áíÜãíùóç áðü `%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 ""
 "áäõíáìßá ÷ñÞóçò ôïõ êñõðôáëãüñéèìïõ IDEA ãéá üëá ôá êëåéäßá ìå ôá "
 "ïðïßáêñõðôïãñáöåßôå.\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 "ÓÇÌÅÉÙÓÇ: ï áëãüñéèìïò êñõðôïãñÜöçóçò %d äåí åßíáé óôéò åðéëïãÝò\n"
 
-#: g10/encode.c:646
+#: 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/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 "ôï êëåéäß '%s' äå âñÝèçêå: %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 "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìðëïê êëåéäéþí: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "êëåéäß %08lX: äåí åßíáé Ýíá rfc2440 êëåéäß - ðáñáëåßöèçêå\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "êëåéäß %08lX: äåí åßíáé ðñïóôáôåõìÝíï - ðáñáëåßöèçêå\n"
 
-#: g10/export.c:196
+#: 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:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ýãéíå êáììßá åîáãùãÞ\n"
 
@@ -1954,261 +1976,266 @@ msgstr "÷ñÞóç ôïõ äåõôåñåýïíôïò êëåéäéïý %08lX áíôß ôïõ ðñùôåýïíôïò %08lX\n"
 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 "          ÷ùñßò user 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 "          íÝá user 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:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñç äÝóìåõóç õðïêëåéäéïý\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 "êëåéäß %08lX: äåí õðÜñ÷åé áõôü ôï user ID\n"
 
-#: g10/import.c:544
+#: 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: äåêôü ìç éäéï-õðïãåãñáììÝíï user ID '%s'\n"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "êëåéäß %08lX: äåí Ý÷åé Ýãêõñá user ID\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "áõôü ìðïñåß íá óõíÝâåé áðü ìéá áðïýóá éäéïûðïãñáöÞ\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 "êëåéäß %08lX: ìõóôéêü êëåéäß ðïõ äå âñÝèçêå: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "êëåéäß %08lX:  íÝï êëåéäß - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "äåí âñåèçêå åããñÜøéìç êëåéäïèÞêç: %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 "åããñáöÞ óôï  `%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 "áäõíáìßá åããñáöÞò ôçò êëåéäïèÞêçò `%s': %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "êëåéäß %08lX: äçìüóéï êëåéäß Ý÷åé åéóá÷èåß\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "êëåéäß %08lX: äåí ôáéñéÜæåé ìå ôï áíôßãñáöï ìáò\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 "êëåéäß %08lX: áäõíáìßá åíôïðéóìïý ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %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 "êëåéäß %08lX: áäõíáìßá áíÜãíùóçò ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "êëåéäß %08lX: 1 íÝï user ID\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "êëåéäß %08lX: %d íÝá user ID\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "êëåéäß %08lX: 1 íÝá õðïãñáöÞ\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "êëåéäß %08lX: %d íÝåò õðïãñáöÝò\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "êëåéäß %08lX: 1 íÝï õðïêëåéäß\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "êëåéäß %08lX: %d íÝá õðïêëåéäéÜ\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "êëåéäß %08lX: áìåôÜâëçôï\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "äåí õðÜñ÷åé ðñïêáèïñéóìÝíç êëåéäïèÞêç: %s\n"
 
-#: g10/import.c:781
+#: 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:785
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "êëåéäß %08lX: Þäç óôç ìõóôéêÞ êëåéäïèÞêç\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "êëåéäß %08lX: äå âñÝèçêå ôï ìõóôéêü êëåéäß: %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 ""
 "êëåéäß %08lX: ü÷é äçìüóéï êëåéäß - áäõíáìßá åöáñìïãÞò ðéóôïðïéçôéêïý "
 "áíÜêëçóçò\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - áðüññéøç\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "êëåéäß %08lX: ðéóôïðïéçôéêü áíÜêëçóçò åéóÞ÷èçêå\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "êëåéäß %08lX: äåí õðÜñ÷åé user ID ãéá ôçí õðïãñáöÞ\n"
 
-#: g10/import.c:941
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý óôï user id \"%"
 "s\"\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñç éäéï-õðïãñáöÞ óôï user id \"%s\"\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôç äÝóìåõóç êëåéäéïý\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñç äÝóìåõóç õðïêëåéäéïý\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "êëåéäß %08lX: ðáñáëåßöèçêå user ID '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "êëåéäß %08lX: ðáñáëåßöèçêå õðïêëåéäß\n"
@@ -2217,112 +2244,120 @@ 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:1047
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "êëåéäß %08lX: ìç åîáãüìåíç õðïãñáöÞ (êëÜóç %02x) - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "êëåéäß %08lX: ôï ðéóôïðïéçôéêü áíÜêëçóçò óå ëÜèïò óçìåßï - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - ðáñáëåßöèçêå\n"
 
-#: g10/import.c:1174
+#: 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: åíôïðßóôçêå äéðëü user ID - åíþèçêáí\n"
 
-#: g10/import.c:1233
-#, 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:1247
-#, 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:1304
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "êëåéäß %08lX: ðéóôïðïéçôéêü áíÜêëçóçò ðñïóôÝèçêå\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "êëåéäß %08lX: Üìåóç õðïãñáöÞ êëåéäéïý ðñïóôÝèçêå\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[áíÜêëçóç]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[éäéï-õðïãñáöÞ]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 êáêÞ õðïãñáöÞ\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 êáêÝò õðïãñáöÝò\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 õðïãñáöÞ äåí åëÝã÷èçêå ëüãù ÷áìÝíïõ êëåéäéïý\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 õðïãñáöÝò äåí åëÝã÷èçêáí ëüãù ÷áìÝíùí êëåéäéþí\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 õðïãñáöÞ äåí åëÝã÷èçêå ëüãï åíüò óöÜëìáôïò\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 õðïãñáöÝò äåí åëÝã÷èçêáí ëüãù óöáëìÜôùí\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID áíé÷íåýôçêå ÷ùñßò Ýãêõñç éäéï-õðïãñáöÞ\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID áíé÷íåýèçêáí ÷ùñßò Ýãêõñåò éäéï-õðïãñáöÝò\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Ôï user ID \"%s\" áíáêáëåßôå."
 
-#: 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
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï õðïãñÜøåôå; (y/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 "  Áäõíáìßá õðïãñáöÞò.\n"
 
-#: 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 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: `%s' åßíáé Ýíá Üäåéï áñ÷åßï\n"
 
-#: g10/keyedit.c:395
+#: g10/keyedit.c:396
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2331,14 +2366,14 @@ msgstr ""
 "Ç ðñïõðÜñ÷ïõóá õðïãñáöÞ óáò óôï \"%s\"\n"
 "åßíáé ìéá ôïðéêÞ õðïãñáöÞ.\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 "ÈÝëåôå íá ôç ðñïÜãåôå óå ìéá ðëÞñç åîáãþãéìç õðïãñáöÞ; (y/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2347,39 +2382,39 @@ msgstr ""
 "Ç ðñïõðÜñ÷ïõóá õðïãñáöÞ óáò óôï \"%s\"\n"
 "åßíáé ìéá ôïðéêÞ õðïãñáöÞ.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "ÈÝëåôå íá ôç ðñïÜãåôå óå ìéá ðëÞñç åîáãþãéìç õðïãñáöÞ; (y/N) "
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" Þäç õðïãñÜöèçêå áðü ôï êëåéäß %08lX\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" Þäç õðïãñÜöèçêå áðü ôï êëåéäß %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Ôßðïôá ãéá íá õðïãñáöåß ìå ôï êëåéäß  %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Áõôü ôï êëåéäß Ý÷åé ëÞîåé!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Áõôü ôï êëåéäß ðñüêåéôå íá ëÞîåé óôéò %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "ÈÝëåôå ç õðïãáöÞóáò íá ëÞîåé ôáõôü÷ñïíá;  (Y/n) "
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:532
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2387,11 +2422,11 @@ msgstr ""
 "Ìðïñåßôå íá ÷ñçóéìüðïéÞóåôå ìéá OpenPGP õðïãñáöÞ óå Ýíá PGP 2.x ìüíï óå "
 "êáôÜóôáóç --pgp2.\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Áõôü èá êÜíåé ôï êëåéäß Ü÷ñçóôï ìå ôï 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"
@@ -2401,27 +2436,27 @@ msgstr ""
 "áíÞêåé ðñÜãìáôé óôï ðñïáíöåñèÝí Üôïìï; ÅÜí äåí îÝñåôå ôé íá áðáíôÞóåôå "
 "ðáôÞóôå\"0\".\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Äåí áðáíôþ.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Äåí Ý÷ù åëÝãîåé êáèüëïõ.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ¸÷ù êÜíåé ôïí óõíÞèç Ýëåã÷ï.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ¸÷ù êÜíåé åêôåôáìÝíï Ýëåã÷ï.%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: \""
@@ -2429,33 +2464,33 @@ msgstr ""
 "Óßãïõñá èÝëåôå íá õðïãñÜøåôå áõôü ôï êëåéäß\n"
 "ìå ôï êëåéäß óáò: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "áõôü ìðïñåß íá óõíÝâåé áðü ìéá áðïýóá éäéïûðïãñáöÞ\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"
 "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-åîáãþãéìç.\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"
 "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-áíáêáëÝóéìç.\n"
 "\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2463,7 +2498,7 @@ msgstr ""
 "\n"
 "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-åîáãþãéìç.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2472,7 +2507,7 @@ msgstr ""
 "Ç õðïãñáöÞ èá óçìåéùèåß óáí ìç-áíáêáëÝóéìç.\n"
 "\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2480,7 +2515,7 @@ msgstr ""
 "\n"
 "Äåí Ý÷ù åëÝãîåé êáèüëïõ áõôü ôï êëåéäß.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2488,7 +2523,7 @@ msgstr ""
 "\n"
 "¸÷ù êÜíåé óõíçèéóìÝíï Ýëåã÷ï óå áõôü ôï êëåéäß.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2496,33 +2531,33 @@ msgstr ""
 "\n"
 "¸÷ù åëÝãîåé ðïëý ðñïóåêôéêÜ áõôü ôï êëåéäß.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Óßãïõñá íá õðïãñáöåß; "
 
-#: 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 "ç õðïãñáöÞ áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Áõôü ôï êëåéäß äåí ðñïóôáôåýåôáé.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "ÌõóôéêÜ ôìÞìáôá ôïõ êýñéïõ êëåéäéïý äåí åßíáé äéáèÝóéìá.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Ôï êëåéäß ðñïóôáôåýåôáé.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Áäýíáôç ç åðåîåñãáóßá áõôïý ôïõ êëåéäéïý:%s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2530,466 +2565,466 @@ msgstr ""
 "ÐëçêôñïëïãÞóôå ôçí íÝá öñÜóç êëåéäß ãéá áõôü ôï ìõóôéêü êëåéäß.\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"
 msgstr "Äåí èÝëåôå öñÜóç êëåéäß - áõôü åßíáé ìÜëëïí *êáêÞ* éäÝá!\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Óßãïõñá èÝëåôå íá êÜíåôå áõôü; "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "ìåôáêßíçóç õðïãñáöÞò êëåéäéïý óôç óùóôÞ èÝóç\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "áðïèÞêåõóç êáé Ýîïäïò"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "áðåéêüíéóç ôïõ fingerprint"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "áðåéêüíéóç ôùí êëåéäéþí êáé ôùí user ID"
 
-#: 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 "åðéëïãÞ user ID N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "åðéëïãÞ äåõôåñåýïíôïò êëåéäéïý N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "áðåéêüíéóç õðïãñáöþí"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ìç-áíáêáëÝóéìá"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "ðñïóèÞêç åíüò user ID"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "ðñïóèÞêç åíüò photo ID"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "äéáãñáöÞ åíüò user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "äéáãñáöÞ åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "addkey"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "äéáãñáöÞ õðïãñáöþí"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "ðñùôåýùí"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "óçìåßùóç ôïõ user ID óáí ðñùôåýùí"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "áëëáãÞ ìåôáîý ôçò áðåéêüíéóçò ìõóôéêïý êáé äçìüóéïõ êëåéäéïý"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: 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 "áðåéêüíéóç ðñïåðéëïãþí (åéäéêÝò)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "áðåéêüíéóç åðéëïãþí (áíáëõôéêÜ)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "áíáùåùìÝíåò åðéëïãÝò"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "áíÜêëçóç õðïãñáöþí"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "áíÜêëçóç åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "áðåíåñãïðïéåß Ýíá êëåéäß"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "åíåñãïðïéåß Ýíá êëåéäß"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "áðåéêüíéóç photo ID"
 
-#: 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 "äåí ìðïñåß íá ãßíåé áõôü óå êáôÜóôáóç äÝóìçò (batchmode)\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Ôï ìõóôéêü êëåéäß åßíáé äéáèÝóéìï.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "ÅíôïëÞ> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Áðáéôåßôáé ôï ìõóôéêü êëåéäß ãéá íá ãßíåé áõôü.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôçí åíôïëÞ \"toggle\" ðñþôá.\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "Ôï êëåéäß áíáêëÞèçêå."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "ÓõìâïõëÞ: ÅðéëÝîôå ôï user ID ãéá õðïãñáöÞ\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "ÁõôÞ ç åíôïëÞ áðáãïñåýåôå óå áõôÞ ôçí êáôÜóôáóç %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 "ÐñÝðåé íá åðéëÝîåôå ôï ëéãüôåñï Ýíá user ID.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôï ôåëåõôáßï user ID!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí üëá ôá åðéëåãìÝíá user ID; "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; "
 
-#: 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 "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí ôá åðéëåãìÝíá êëåéäéÜ; "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí ôá åðéëåãìÝíá êëåéäéÜ; "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Óßãïõñá èÝëåôå íá áíáíåùèïýí ïé ðñïåðéëïãÝò ãéá ôï åðéëåãìÝíï user ID; "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Óßãïõñá íá áíáíåùèïýí ïé ðñïåðéëïãÝò;"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "ÁðïèÞêåõóç ôùí áëëáãþí; "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Ôåñìáôéóìüò ÷ùñßò áðïèÞêåõóç; "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ìç Ýãêõñç åíôïëÞ  (äïêéìÜóôå \"help\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (åõáßóèçôï)"
 
-#: 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  äçìéïõñãßá: %s ëÞîç: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " åìðéóôïóýíç: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! ôï êëåéäß áíáêëÞèçêå: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- âñÝèçêå ðáñáðïéçìÝíç áíÜêëçóç\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? ðñüâëçìá óôïí Ýëåã÷ï áíÜêëçóçò: %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
 #, fuzzy
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
@@ -2998,7 +3033,7 @@ msgstr ""
 "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá Ýããõñç\n"
 "åêôüò êáé åÜí åðáíáêéíÞóåôå ôï ðñüãñáììá.\n"
 
-#: 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"
@@ -3007,108 +3042,108 @@ msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n"
 "               ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "ÐëçêôñïëïãÞóôå ôï ìÝãåèïò ôïõ êëåéäéïý"
 
-#: 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 "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\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 "êëåéäß %08lX: ìç Ýãêõñç éäéï-õðïãñáöÞ óôï user id \"%s\"\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Äåí õðÜñ÷åé äåõôåñåýïí êëåéäß ìå äåßêôç %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3117,7 +3152,7 @@ msgstr ""
 "\"\n"
 "õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -3126,56 +3161,56 @@ msgstr ""
 "\"\n"
 "õðïãñÜöèçêå ôïðéêÜ ìå ôï êëåéäß óáò %08lX óôéò %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   áíáêëÞèçêå áðü %08lX óôéò %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   õðïãñÜöèçêå áðü %08lX óôéò %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (ìç-åîáãþãéìï)"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "êáíÝíá ìõóôéêü êëåéäß\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 "Áðåéêüíéóç %s photo ID ìåãÝèïõò %ld ãéá ôï êëåéäß 0x%08lX (uid %d)\n"
@@ -3189,7 +3224,7 @@ msgstr "ÐïëéôéêÞ õðïãñáöÞò: "
 msgid "Signature policy: "
 msgstr "ÐïëéôéêÞ õðïãñáöÞò: "
 
-#: 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 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: âñÝèçêáí ìç Ýãêõñá äåäïìÝíá óçìåßùóçò\n"
 
@@ -3211,159 +3246,168 @@ msgid "Keyring"
 msgstr "ÊëåéäïèÞêç"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ëÞãåé: %s]"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Fingerprint:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "áðåéêüíéóç ôçò ëßóôáò êëåéäéþí êáé áðïôõðùìÜôùí (fingerprints)"
 
-#. 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 "             Áðïôýðùìá:"
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     Áðïôýðùìá êëåéäéïý ="
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     Áðïôýðùìá êëåéäéïý ="
+
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     Áðïôýðùìá êëåéäéïý ="
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     Áðïôýðùìá êëåéäéïý ="
 
-#: 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 êñõðôïãñáöçìÝíá äåäïìÝíá\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 "êñõðôïãñáöçìÝíï ìå Üãíùóôï áëãüñéèìï %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "äçìüóéï êëåéäß åßíáé %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "êñõðôïãñáöçìÝíá äåäïìÝíá ìå äçìüóéï êëåéäß: êáëü 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 "êñõðôïãñáöçìÝíï ìå %u-bit %s êëåéäß, ID %08lX, äçìéïõñãÞèçêå %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "êñõðôïãñáöçìÝíï ìå %s key, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "êñõðôïãñÜöçóç ìå äçìüóéï êëåéäß áðÝôõ÷å: %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 "õðüèåóç %s êñõðôïãñáöçìÝíùí äåäïìÝíùí\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "Êñõðôáëãüñéèìïò IDEA ìç äéáèÝóéìïò, áéóéüäïîç ðñïóðÜèåéá ÷ñÞóçò ôïõ\n"
 "%s áíôßèåôá\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "áðïêñõðôïãñÜöçóç OK\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï êñõðôïãñáöçìÝíï ìÞíõìá Ý÷åé ðåéñá÷èåß!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ï áðïóôïëÝáò æÞôçóå \"ãéá-ôá-ìÜôéá-óáò-ìüíï\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "áñ÷éêü üíïìá áñ÷åßïõ='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "áíåîÜñôçôç áíÜêëçóç - ÷ñçóéìïðïéåßóôå \"gpg --import\" ãéá åöáñìïãÞ\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Óçìåßùóç: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "ÐïëéôéêÞ: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "êáôáóôïëÞ áíÜêëçóçò õðïãñáöÞò\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 "áäõíáìßá ÷åéñéóìïý áõôþí ôùí ðïëëáðëþí õðïãñáöþí\n"
 
-#: g10/mainproc.c:1301
+#: 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:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "ÊÁÊÇ õðïãñáöÞ áðü \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "ËçãìÝíç õðïãñáöÞ áðü \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "ÊáëÞ õðïãñáöÞ áðü \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[áâÝâáéï]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                ãíùóôü óáí \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Áäõíáìßá åëÝã÷ïõ ôçò õðïãñáöÞò: %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 "äåí åßíáé áðïêïììÝíç õðïãñáöÞ\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "áíåîÜñôçôç õðïãñáöÞ êëÜóçò 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "õðïãñáöÞ ðáëéïý óôõë (PGP 2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ìç Ýãêõñï ñéæéêü(root) ðáêÝôï áíé÷íåýôçêå óôï proc_tree()\n"
 
@@ -3383,13 +3427,13 @@ msgstr ""
 "Ýíá ðéï óõíçèéóìÝíï!\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 "Ðñïåéäïðïßçóç: ìç áóöáëÞò éäéïêôçóßá óôï %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 "Ðñïåéäïðïßçóç: ìç áóöáëåßò Üäåéåò óôï %s \"%s\"\n"
 
 #: g10/misc.c:443
@@ -3453,7 +3497,7 @@ msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\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"
@@ -3598,42 +3642,41 @@ msgstr "ÓÇÌÅÉÙÓÇ: ôï ìõóôéêü êëåéäß %08lX Ýëçîå óôéò %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "êëåéäß %08lX: ôï êëåéäß Ý÷åé áíáêëçèåß!\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 "áßôçóç êëåéäéïý %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: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 "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "áäõíáìßá áíáæÞôçóçò äéáêïìéóôÞ: %s\n"
@@ -3666,29 +3709,29 @@ msgstr ""
 "äçìéïõñãßá ôïõ ìç óõíåéóôüìåíïõ 16-bit checksum ãéá ôç ðñïóôáóßá ôïõ\n"
 "ìõóôéêïý êëåéäéïý\n"
 
-#: 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 ""
 "áõôü ôï, äçìéïõñãÞìåíï áðü PGP, êëåéäß ElGamal ÄÅÍ åßíáé áóöáëÝò ãéá "
 "õðïãñáöÝò!\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 "õðüèåóç êáêÞò õðïãñáöÞò ëüãù Üãíùóôïõ êñßóéìïõ bit\n"
 
@@ -4080,33 +4123,37 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "ï DSA áðáéôåß ôç ÷ñÞóç åíüò 160 bit áëãüñéèìïõ hash\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 "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %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-key\" ãéá äéáãñáöÞ ôïõ.\n"
@@ -4535,6 +4582,12 @@ msgstr "%lu êëåéäéÜ Ý÷ïõí åëåã÷èåß (%lu õðïãñáöÝò)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: êëåéäïèÞêç äçìéïõñãÞèçêå\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingerprint:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "             Áðïôýðùìá:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|ÏÍÏÌÁ=ÔÉÌÇ|÷ñÞóç áõôÞò ôçò êáôÜóôáóçò óçìåßùóçò"
 
diff --git a/po/es.po b/po/es.po
index 2a942a68f..e6b66a71f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,14 +4,14 @@
 #  I've tried to mantain the terminology used by Armando Ramos
 #  <armando@clerval.org> in his PGP 2.3.6i translation.
 #  I also got inspiration from it.po by Marco d'Itri <md@linux.it>
-# Jaime Suárez <jjsuarez@iname.com>, 2001.
+# Jaime Suárez <jsuarez@ono.com>, 2001, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-04-22 21:27+0200\n"
-"Last-Translator: Jaime Suárez <jjsuarez@iname.com>\n"
+"Project-Id-Version: GNU gnupg 1.0.7\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-05-01 00:33+0200\n"
+"Last-Translator: Jaime Suárez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -23,7 +23,7 @@ msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr ""
+msgstr "por favor, vea http://www.gnupg.org/faq.html para más información\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -49,7 +49,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "salir"
 
@@ -130,35 +130,35 @@ msgstr "No se puede abrir el anillo de claves"
 
 #: util/errors.c:67
 msgid "invalid packet"
-msgstr "Paquete inválido"
+msgstr "paquete inválido"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "Armadura inválida"
+msgstr "armadura inválida"
 
 #: util/errors.c:69
 msgid "no such user id"
-msgstr "No existe el ID de usuario"
+msgstr "no existe el ID de usuario"
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "Clave secreta no disponible"
+msgstr "clave secreta no disponible"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "Clave secreta incorrecta"
+msgstr "clave secreta incorrecta"
 
 #: util/errors.c:72
 msgid "not supported"
-msgstr "No disponible"
+msgstr "no disponible"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "Clave incorrecta"
+msgstr "clave incorrecta"
 
 #: util/errors.c:74
 msgid "file read error"
-msgstr "Error de lectura"
+msgstr "error de lectura"
 
 #: util/errors.c:75
 msgid "file write error"
@@ -166,35 +166,35 @@ msgstr "error de escritura"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "Algoritmo de compresión desconocido"
+msgstr "algoritmo de compresión desconocido"
 
 #: util/errors.c:77
 msgid "file open error"
-msgstr "Error al abrir fichero"
+msgstr "error al abrir fichero"
 
 #: util/errors.c:78
 msgid "file create error"
-msgstr "Error al crear fichero"
+msgstr "error al crear fichero"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "Contraseña incorrecta"
+msgstr "contraseña incorrecta"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "Algoritmo de clave pública no implementado"
+msgstr "algoritmo de clave pública no implementado"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "Algoritmo de cifrado no implementado"
+msgstr "algoritmo de cifrado no implementado"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "Clase de firma desconocida"
+msgstr "clase de firma desconocida"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "Error en la base de datos de confianza"
+msgstr "error en la base de datos de confianza"
 
 #: util/errors.c:84
 msgid "bad MPI"
@@ -202,15 +202,15 @@ msgstr "MPI incorrecto"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "Límite de recurso"
+msgstr "límite de recurso"
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "Anillo inválido"
+msgstr "anillo inválido"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "Certificado incorrecto"
+msgstr "certificado incorrecto"
 
 #: util/errors.c:88
 msgid "malformed user id"
@@ -218,19 +218,19 @@ msgstr "ID de usuario mal formado"
 
 #: util/errors.c:89
 msgid "file close error"
-msgstr "Error al cerrar fichero"
+msgstr "error al cerrar fichero"
 
 #: util/errors.c:90
 msgid "file rename error"
-msgstr "Error al renombrar fichero"
+msgstr "error al renombrar fichero"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "Error al borrar fichero"
+msgstr "error al borrar fichero"
 
 #: util/errors.c:92
 msgid "unexpected data"
-msgstr "Datos inesperados"
+msgstr "datos inesperados"
 
 # o tal vez "en el sello..."
 # Creo que es mejor "con el sello de fecha", no es un conflicto
@@ -238,23 +238,23 @@ msgstr "Datos inesperados"
 # Ok.
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "Conflicto con el sello de fecha"
+msgstr "conflicto con el sello de fecha"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "Algoritmo de clave pública no utilizable"
+msgstr "algoritmo de clave pública no utilizable"
 
 #: util/errors.c:95
 msgid "file exists"
-msgstr "El fichero existe"
+msgstr "el fichero existe"
 
 #: util/errors.c:96
 msgid "weak key"
-msgstr "Clave débil"
+msgstr "clave débil"
 
 #: util/errors.c:97
 msgid "invalid argument"
-msgstr "Argumento inválido"
+msgstr "argumento inválido"
 
 #: util/errors.c:98
 msgid "bad URI"
@@ -266,11 +266,11 @@ msgstr "URI no disponible"
 
 #: util/errors.c:100
 msgid "network error"
-msgstr "Error de red"
+msgstr "error de red"
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "No cifrado"
+msgstr "no cifrado"
 
 #: util/errors.c:103
 msgid "not processed"
@@ -279,16 +279,15 @@ msgstr "no procesado"
 #. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "Clave pública inutilizable"
+msgstr "clave pública inutilizable"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "Clave secreta inutilizable"
+msgstr "clave secreta inutilizable"
 
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "Error general"
+msgstr "error del servidor de claves"
 
 # bicho :-)
 # ¿Error simplemente?
@@ -301,9 +300,9 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 #: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "Ha encontrado un error... (%s:%d)\n"
+msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -329,8 +328,7 @@ 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"
+msgstr "atención: tamaño incorrecto del fichero de semillas aleatorias - no se usa\n"
 
 #: cipher/random.c:348
 #, c-format
@@ -374,7 +372,7 @@ msgstr ""
 "¡NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -390,7 +388,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:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -398,170 +396,163 @@ msgstr ""
 "@Órdenes:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
-msgstr ""
+msgstr "|[ficheros]|cifra ficheros"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "sólo almacenar"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
-msgstr ""
+msgstr "|[ficheros]|descifra ficheros"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:320
-#, fuzzy
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
-msgstr "elimina la clave del anillo público"
+msgstr "elimina claves del anillo público"
 
-#: g10/g10.c:322
-#, fuzzy
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
-msgstr "elimina la clave del anillo privado"
+msgstr "elimina claves del anillo privado"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:325
-#, fuzzy
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
-msgstr "firma la clave localmente"
+msgstr "firma la clave no revocablemente"
 
-#: g10/g10.c:326
-#, fuzzy
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
-msgstr "firma la clave localmente"
+msgstr "firma la clave localmente y no revocablemente"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:334
-#, fuzzy
+#: g10/g10.c:320
 msgid "search for keys on a key server"
-msgstr "exporta claves a un servidor de claves"
+msgstr "busca claves en un servidor de claves"
 
-#: g10/g10.c:336
-#, fuzzy
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
-msgstr "importa claves desde un servidor de claves"
+msgstr "actualiza claves desde un servidor de claves"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "lista sólo la secuencia de paquetes"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:350
-#, fuzzy
+#: g10/g10.c:336
 msgid "unattended trust database update"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza dañada"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o de la entrada estándar"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o a la entrada estándar"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime resúmenes de mensaje"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -571,90 +562,86 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:376
+#: g10/g10.c:362
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresión N (0 no comprime)"
 
-#: g10/g10.c:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:390
-#, fuzzy
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
-msgstr "fuerza firmas v3"
+msgstr "no fuerza firmas v3"
 
-#: g10/g10.c:391
-#, fuzzy
+#: g10/g10.c:377
 msgid "force v4 key signatures"
-msgstr "fuerza firmas v3"
+msgstr "fuerza firmas v4"
 
-#: g10/g10.c:392
-#, fuzzy
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
-msgstr "fuerza firmas v3"
+msgstr "no fuerza firmas v4"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
-msgstr "siempre usa un MCD para cifrar"
+msgstr "siempre usa un MDC para cifrar"
 
-#: g10/g10.c:395
-#, fuzzy
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
-msgstr "siempre usa un MCD para cifrar"
+msgstr "nunca usa un MDC para cifrar"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
 # usa
 # Vale.
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "usa el agente gpg"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -664,118 +651,119 @@ 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:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "añade este anillo a la lista de anillos"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "añade este anillo secreto a la lista"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
-msgstr ""
+msgstr "muestra en qué anillos está una clave"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe información de estado en este descriptor de fichero"
 
-#: g10/g10.c:418
-#, fuzzy
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
-msgstr "|DF|escribe información de estado en este descriptor de fichero"
+msgstr "|[fichero]|escribe información de estado en el fichero"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|confía plenamente en esta clave"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga módulo de extensiones FICHERO"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 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:434
-#, fuzzy
+#: g10/g10.c:414
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP"
+msgstr "todas las opciones de paquete, cifrado y resumen tipo PGP 2.x"
 
-#: g10/g10.c:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contraseña N"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 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:444
+#: g10/g10.c:422
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contraseñas"
 
-#: g10/g10.c:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresión N"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
-msgstr ""
+msgstr "Muestra IDs fotográficos"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
-msgstr ""
+msgstr "No muestra IDs fotográficos"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
-msgstr ""
+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:459
+#: g10/g10.c:434
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -783,7 +771,7 @@ msgstr ""
 "@\n"
 "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -803,15 +791,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -821,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:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -829,245 +817,228 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, 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:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
-msgstr ""
+msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1228
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:1476
+#: 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:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr "por favor use \"--keyserver-options %s\" en su lugar\n"
+
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/g10.c:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr ""
+msgstr "sólo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:1525
+#: g10/g10.c:1395
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr ""
+msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:1531
+#: g10/g10.c:1401
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr ""
+msgstr "debe usar ficheros (no tuberías) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1414
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr ""
+msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
-msgstr ""
+msgstr "este mensaje podría no ser utilizable por PGP 2.x\n"
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: g10/g10.c:1499
 #, 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:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 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:1637
+#: g10/g10.c:1508
 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:1641
+#: g10/g10.c:1512
 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:1645
-#, fuzzy
+#: g10/g10.c:1516
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
-
-#: g10/g10.c:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "muestra preferencias"
-
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "muestra preferencias"
+msgstr "nivel de comprobación por defecto inválido; debe ser 0, 1, 2, ó 3\n"
 
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "muestra preferencias"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
-msgstr "muestra preferencias"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
+msgstr "preferencias inválidas\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, 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:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1840
-#, fuzzy
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [nombre_fichero]"
+msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1894
-#, fuzzy
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
-msgstr "--sign-key id-usuario"
+msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:1902
-#, fuzzy
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
-msgstr "--lsign-key id-usuario"
+msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [órdenes]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribución inválido `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1075,38 +1046,30 @@ 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:2257
+#: g10/g10.c:2101
 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:2260 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 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:2474
-#, 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: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:2483
-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: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:2520
-#, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "URL de política inválida\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:2522
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "URL de política inválida\n"
+#: g10/g10.c:2333
+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/armor.c:314
 #, c-format
@@ -1177,8 +1140,7 @@ 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"
@@ -1204,31 +1166,28 @@ msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es válido"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "Razón para la revocación: "
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "Comentario a la revocación: "
 
 #. a string with valid answers
 #: g10/pkclist.c:252
 msgid "iImMqQsS"
-msgstr ""
+msgstr "iImMqQsS"
 
 #: g10/pkclist.c:258
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"No hay confianza definida para %lu:\n"
+"No hay confianza definida para:\n"
 "%4u%c/%08lX %s \""
 
 #: 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"
@@ -1239,40 +1198,35 @@ msgstr ""
 "verifique las claves de otros usuarios (mirando pasaportes,\n"
 "comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
-" 1 = No lo sé\n"
-" 2 = NO me fío\n"
-" 3 = Me fío marginalmente\n"
-" 4 = Me fío completamente\n"
-" i = Mostrar más información\n"
 
 #: g10/pkclist.c:273
 #, c-format
 msgid " %d = Don't know\n"
-msgstr ""
+msgstr " %d = No lo sé\n"
 
 #: g10/pkclist.c:274
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lX: ¡Esta clave NO es de confianza!\n"
+msgstr "%d = No confío\n"
 
 #: g10/pkclist.c:275
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = Confío poco\n"
 
 #: g10/pkclist.c:276
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s: no es una base de datos de confianza\n"
+msgstr " %d = Confío totalmente\n"
 
 #: g10/pkclist.c:278
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = confío por completo\n"
 
 #: g10/pkclist.c:279
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = por favor muéstreme más información\n"
 
 #: g10/pkclist.c:281
 msgid " m = back to the main menu\n"
@@ -1280,7 +1234,7 @@ msgstr " m = volver al menú principal\n"
 
 #: g10/pkclist.c:284
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " s = saltar esta clave\n"
 
 #: g10/pkclist.c:285
 msgid " q = quit\n"
@@ -1291,9 +1245,8 @@ msgid "Your decision? "
 msgstr "Su decisión: "
 
 #: g10/pkclist.c:313
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "¿De verdad quiere borrar esta clave? "
+msgstr "¿De verdad quiere asignar total confianza a esta clave? "
 
 #: g10/pkclist.c:325
 msgid "Certificates leading to an ultimately trusted key:\n"
@@ -1319,10 +1272,9 @@ msgid "%08lX: key has expired\n"
 msgstr "%08lX: clave caducada\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 hay indicios de que la firma pertenezca al propietario.\n"
+#, 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"
 
 #: g10/pkclist.c:448
 #, c-format
@@ -1375,9 +1327,8 @@ msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
 
 #: g10/pkclist.c:574
-#, fuzzy
 msgid "Note: This key has been disabled.\n"
-msgstr "Esta clave está deshabilitada"
+msgstr "Nota: Esta clave está deshabilitada.\n"
 
 #: g10/pkclist.c:579
 msgid "Note: This key has expired!\n"
@@ -1385,12 +1336,10 @@ 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
@@ -1402,165 +1351,149 @@ 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 suficientes firmas de "
-"confianza!\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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave pública ya presente\n"
 
-#: g10/pkclist.c:803
-#, fuzzy
+#: g10/pkclist.c:752
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr ""
-"No se ha especificado un ID de usuario (puede usar \"-r\")\n"
-"\n"
+msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
+"\n"
+"Introduzca ID de usuario. Acabe con una línea vacía: "
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 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:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "Clave pública deshabilitada.\n"
 
-#: g10/pkclist.c:862
-#, fuzzy
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
-msgstr "%s: omitida: clave pública ya presente\n"
+msgstr "omitida: clave pública ya establecida\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave pública deshabilitada\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
-msgstr ""
+msgstr "la preferencia %c%lu no es válida\n"
 
-#: g10/keygen.c:189
-#, fuzzy, c-format
+#: g10/keygen.c:187
+#, c-format
 msgid "preference %c%lu duplicated\n"
-msgstr "`%s' omitido: duplicado\n"
+msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:194
-#, fuzzy, c-format
+#: g10/keygen.c:192
+#, c-format
 msgid "too many `%c' preferences\n"
-msgstr "Demasiadas preferencias"
+msgstr "demasiadas `%c' preferencias\n"
 
-#: g10/keygen.c:264
-#, fuzzy
+#: g10/keygen.c:257
 msgid "invalid character in preference string\n"
-msgstr "Caracter inválido en el nombre\n"
+msgstr "caracter inválido en cadena de preferencias\n"
 
-#: g10/keygen.c:524
-#, fuzzy
-msgid "writing direct signature\n"
-msgstr "escribiendo autofirma\n"
-
-#: g10/keygen.c:563
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firmar)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrar)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firmar y cifrar)\n"
 
-#: g10/keygen.c:949
-#, fuzzy, c-format
+#: g10/keygen.c:784
+#, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (sólo firmar)\n"
+msgstr "   (%d) RSA (sólo firmar)\n"
 
-#: g10/keygen.c:951
-#, fuzzy, c-format
-msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (sólo cifrar)\n"
-
-#: g10/keygen.c:953
+#: g10/keygen.c:786
 #, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (firmar y cifrar)\n"
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (sólo cifrar)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 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:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1573,19 +1506,19 @@ msgstr ""
 "        el tamaño por defecto es 1024 bits\n"
 " el tamaño máximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "¿De qué tamaño quiere la clave (1024)? "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 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:1027
+#: g10/keygen.c:852
 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:1030
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
 
@@ -1597,12 +1530,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:1041
+#: g10/keygen.c:866
 #, 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:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1610,29 +1543,27 @@ 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:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Seguro que quiere una clave de este tamaño? "
 
-#: g10/keygen.c:1050
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: 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 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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1648,8 +1579,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:1126
-#, fuzzy
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1665,31 +1595,30 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:1150
-#, fuzzy
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
-msgstr "¿Validez de la clave (0)? "
+msgstr "Clave válida ¿durante (0)? "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:1160
-#, fuzzy, c-format
+#: g10/keygen.c:985
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "La clave nunca caduca\n"
+msgstr "%s nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:1167
-#, fuzzy, c-format
+#: g10/keygen.c:992
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "La clave caduca el %s\n"
+msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1697,15 +1626,14 @@ msgstr ""
 "Su sistema no puede mostrar fechas más allá del 2038.\n"
 "Sin embargo funcionará correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "¿Es correcto (s/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -1717,44 +1645,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Dirección inválida\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido en el comentario\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1765,29 +1693,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 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 realo 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:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 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:1327
+#: g10/keygen.c:1152
 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:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1795,17 +1721,16 @@ msgstr ""
 "Necesita una contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
-#, fuzzy
+#: g10/keyedit.c:701 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
-msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n"
+msgstr "contraseña repetida incorrectamente; inténtelo de nuevo"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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"
@@ -1817,7 +1742,7 @@ msgstr ""
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1246
 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"
@@ -1830,54 +1755,53 @@ msgstr ""
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendrá 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave pública en `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2205
-#, fuzzy, c-format
+#: g10/keygen.c:1952
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "clave %08lX: clave pública no encontrada: %s\n"
+msgstr "anillo público de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2211
-#, fuzzy, c-format
+#: g10/keygen.c:1958
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "no puede bloquearse el anillo secreto: %s\n"
+msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2225
-#, fuzzy, c-format
+#: g10/keygen.c:1972
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "error escribiendo anillo `%s': %s\n"
+msgstr "error escribiendo anillo público `%s': %s\n"
 
-#: g10/keygen.c:2232
-#, fuzzy, c-format
+#: g10/keygen.c:1979
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "error escribiendo anillo `%s': %s\n"
+msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2253
-#, fuzzy
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
-msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
+msgstr "clave marcada como de confianza absoluta.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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"
@@ -1885,115 +1809,101 @@ 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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 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:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "¿Crear de verdad? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "--output no funciona con esta orden\n"
 
-#: g10/encode.c:126 g10/encode.c:351
-#, fuzzy, c-format
+#: g10/encode.c:92 g10/encode.c:296
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "se han procesado %lu claves\n"
+msgstr "`%s' ya está comprimido\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
-#: g10/tdbio.c:552
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contraseña: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCIÓN: fichero vacío\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr ""
+msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:402
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr ""
+#: 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:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 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:646
+#: g10/encode.c:563
 #, 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/keyedit.c:2211
-#, fuzzy, c-format
+#: g10/delkey.c:69 g10/export.c:141
+#, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "usuario '%s' no encontrado: %s\n"
+msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
-#, fuzzy, c-format
+#: g10/delkey.c:77 g10/export.c:161
+#, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "error leyendo `%s': %s\n"
+msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n"
 
-#: g10/export.c:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no protegida - omitida\n"
 
-#: g10/export.c:196
-#, fuzzy, c-format
+#: g10/export.c:188
+#, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "clave %08lX: clave nueva - omitida\n"
+msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCIÓN: no se ha exportado nada\n"
 
@@ -2003,21 +1913,21 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
+msgstr "Clave %08lX inválida hecha mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2100
+#: g10/getkey.c:1989
 #, 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:2147
+#: g10/getkey.c:2036
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave pública - omitida\n"
@@ -2097,184 +2007,179 @@ msgstr " claves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "clave %08lX: unión de subclave inválida\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: sin identificador de usuario\n"
 
-#: g10/import.c:544
-#, fuzzy, c-format
+#: g10/import.c:455
+#, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
+msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
 
-#: g10/import.c:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: sin identificadores de usuario válidos\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 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:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave pública no encontrada: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/import.c:578
-#, fuzzy, c-format
+#: g10/import.c:489
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "no puede escribirse el anillo: %s\n"
+msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave pública importada\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no coincide con nuestra copia\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, 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:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, 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:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificador de usuario\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:770
-#, fuzzy, c-format
+#: g10/import.c:671
+#, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "no puede bloquearse el anillo secreto: %s\n"
+msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, 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:785
+#: g10/import.c:686
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:790
+#: g10/import.c:691
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:819
+#: g10/import.c:720
 #, 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:859
+#: g10/import.c:760
 #, 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:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocación importado\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, 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:941
-#, fuzzy, c-format
+#: g10/import.c:839
+#, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "clave %08lX: algoritmo de clave pública no disponible\n"
+msgstr "clave %08lX: algoritmo de clave pública no disponible para el id \"%s\"\n"
 
-#: g10/import.c:943
-#, fuzzy, c-format
+#: g10/import.c:841
+#, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "clave %08lX: autofirma inválida\n"
+msgstr "clave %08lX: autofirma inválida para el id \"%s\"\n"
 
-#: g10/import.c:960
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave que unir\n"
 
-#: g10/import.c:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave pública no disponible\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX: unión de subclave inválida\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: omitido ID de usuario '"
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave omitida\n"
@@ -2283,200 +2188,184 @@ 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:1047
+#: g10/import.c:945
 #, 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:1056
+#: g10/import.c:954
 #, 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:1073
+#: g10/import.c:971
 #, 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:1174
+#: g10/import.c:1072
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1131
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr ""
+msgstr "Aviso: la clave %08lX puede estar revocada: recuperando clave de revocación %08lX\n"
 
-#: g10/import.c:1247
+#: g10/import.c:1145
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr ""
+msgstr "Aviso: la clave %08lX puede estar revocada: clave e revocación %08lXno está presente.\n"
 
-#: g10/import.c:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocación añadido\n"
 
-#: g10/import.c:1335
-#, fuzzy, c-format
+#: g10/import.c:1231
+#, c-format
 msgid "key %08lX: direct key signature added\n"
-msgstr "clave %08lX: %d nuevas firmas\n"
+msgstr "clave %08lX: firma directa de clave añadida\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[revocación]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, 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:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, 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:227
+#: g10/keyedit.c:226
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma válida\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:228
 #, 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:356
-#, fuzzy, c-format
+#: g10/keyedit.c:335
+#, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "La clave está protegida.\n"
+msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
-#, fuzzy
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "¿Seguro que quiere una clave de este tamaño? "
+msgstr "¿Seguro que todavía quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 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:395
-#, c-format
-msgid ""
-"The self-signature on \"%s\"\n"
-"is a PGP 2.x-style signature.\n"
-msgstr ""
-
-#: g10/keyedit.c:404
-msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr ""
+msgstr "  Imposible firmar.\n"
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:364
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
+"Su firma actual en \"%s\"\n"
+"es una firma local.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:368
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr ""
+msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:442
-#, fuzzy, c-format
+#: g10/keyedit.c:388
+#, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "Ya firmada por la clave %08lX\n"
+msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n"
 
-#: g10/keyedit.c:446
-#, fuzzy, c-format
+#: g10/keyedit.c:393
+#, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "Ya firmada por la clave %08lX\n"
+msgstr "\"%s\" ya estaba firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:474
-#, fuzzy
+#: g10/keyedit.c:420
 msgid "This key has expired!"
-msgstr "Nota: ¡Esta clave ha caducado!\n"
+msgstr "¡Esta clave ha caducado!"
 
-#: g10/keyedit.c:494
-#, fuzzy, c-format
+#: g10/keyedit.c:440
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Esta clave no está protegida.\n"
+msgstr "Esta clave expirará el %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:444
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr ""
+msgstr "¿Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:531
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\n"
-msgstr ""
+#: 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:533
+#: g10/keyedit.c:479
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr ""
+msgstr "Esto inutilizaría la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr ""
+msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "   (2) He hecho una comprobación informal.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr ""
+msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2484,94 +2373,73 @@ msgstr ""
 "¿Está realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:600
-#, fuzzy
-msgid ""
-"\n"
-"This will be a self-signature.\n"
-msgstr "esto puede ser debido a la ausencia de autofirma\n"
-
-#: g10/keyedit.c:604
-#, fuzzy
-msgid ""
-"\n"
-"Warning: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"La firma se marcará como no exportable.\n"
-"\n"
-
-#: g10/keyedit.c:609
-#, fuzzy
-msgid ""
-"\n"
-"Warning: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"La firma se marcará como no exportable.\n"
-"\n"
-
-#: g10/keyedit.c:616
-#, fuzzy
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
-"La firma se marcará como no exportable.\n"
 "\n"
+"La firma se marcará como no exportable.\n"
 
-#: g10/keyedit.c:620
-#, fuzzy
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
-"La firma se marcará como no exportable.\n"
 "\n"
+"La firma se marcará como no revocable.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "¿Firmar de verdad? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "Esta clave no está protegida.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 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:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "La clave está protegida.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2579,7 +2447,7 @@ msgstr ""
 "Introduzca la nueva contraseña para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2587,589 +2455,553 @@ msgstr ""
 "No ha especificado contraseña. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "¿Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "sale de este menú"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "graba"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "ayuda"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "hdac"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "idu"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "clave"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "comprueba"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
 msgstr "firma"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:912
-#, fuzzy
+#: g10/keyedit.c:830
 msgid "nrsign"
-msgstr "firma"
+msgstr "firmanr"
 
-#: g10/keyedit.c:912
-#, fuzzy
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
-msgstr "firma la clave localmente"
+msgstr "firma la clave irrevocablemente"
 
-#: g10/keyedit.c:913
-#, fuzzy
+#: g10/keyedit.c:831
 msgid "nrlsign"
-msgstr "firmal"
+msgstr "firmanrl"
 
-#: g10/keyedit.c:913
-#, fuzzy
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
-msgstr "firma la clave localmente"
+msgstr "firma la clave local e irrevocablemente"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "añaidu"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "añade un identificador de usuario"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
-msgstr ""
+msgstr "añadirfoto"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:834
 msgid "add a photo ID"
-msgstr "añade un identificador de usuario"
+msgstr "añade un ID fotográfico"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "borridu"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
-msgstr ""
+msgstr "borfoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "añacla"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "añade una clave secundaria"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "borrcla"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "añacla"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "añade una clave secundaria"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "borrfir"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
-msgstr ""
+msgstr "primaria"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "marca ID de usuario como primario"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "cambia"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y públicas"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
-#, fuzzy
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
-msgstr "muestra preferencias"
+msgstr "muestra preferencias (experto)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "verpref"
 
-#: g10/keyedit.c:930
-#, fuzzy
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
-msgstr "muestra preferencias"
+msgstr "muestra preferencias (prolijo)"
 
-#: g10/keyedit.c:931
-#, fuzzy
+#: g10/keyedit.c:848
 msgid "setpref"
-msgstr "pref"
+msgstr "estpref"
 
-#: g10/keyedit.c:931
-#, fuzzy
+#: g10/keyedit.c:848
 msgid "set preference list"
-msgstr "muestra preferencias"
+msgstr "establece preferencias"
 
-#: g10/keyedit.c:932
-#, fuzzy
+#: g10/keyedit.c:849
 msgid "updpref"
-msgstr "pref"
+msgstr "actpref"
 
-#: g10/keyedit.c:932
-#, fuzzy
+#: g10/keyedit.c:849
 msgid "updated preferences"
-msgstr "muestra preferencias"
+msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "contr"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "cambia la contraseña"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "conf"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "revfir"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "revcla"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "descla"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "habcla"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
-msgstr ""
+msgstr "verfoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
-msgstr ""
+msgstr "mostrar ID fotográfico"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/keyedit.c:996
-#, fuzzy, c-format
+#: g10/keyedit.c:913
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "error leyendo `%s': %s\n"
+msgstr "error leyendo bloque de clave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1130
-#, fuzzy
+#: g10/keyedit.c:1047
 msgid "Key is revoked."
-msgstr "La clave está protegida.\n"
+msgstr "La clave está revocada."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "¿Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario para firmar\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1092
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "¡No puede borrar el último identificador de usuario!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "¿Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "¿Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "¿De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "¿De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 msgid "Do you really want to revoke the selected keys? "
 msgstr "¿De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1183
 msgid "Do you really want to revoke this key? "
 msgstr "¿De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1344
-#, fuzzy
+#: g10/keyedit.c:1252
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "¿Borrar realmente todos los identificadores seleccionados? "
+msgstr "¿Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1346
-#, fuzzy
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
-msgstr "¿Crear los certificados de revocación realmente? (s/N)"
+msgstr "¿Actualizar realmente las preferencias? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "¿Grabar cambios? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "¿Salir sin grabar? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualización de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
-msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
+#: g10/keyedit.c:1489
+#, c-format
+msgid "This key may be revoked by %s key %s%s\n"
+msgstr "Esta clave puede ser revocada por %s clave %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
-msgstr ""
+msgstr " (confidencial)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, 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:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! ¡esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "rev-  se encontró una revocación falsificada\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema comprobando la revocación: %s\n"
 
-#: g10/keyedit.c:1827
-msgid "There are no preferences on a PGP 2.x-style key.\n"
-msgstr ""
-
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1574
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
+"Please note that the shown key validity is not necessary 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:1923
+#: g10/keyedit.c:1660
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
-"versions\n"
-"         of PGP to reject this key.\n"
+"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:1928
-#, fuzzy
+#: g10/keyedit.c:1664 g10/keyedit.c:1691
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "¿Seguro que quiere una clave de este tamaño? "
+msgstr "¿Está seguro de querer añadirla? (s/N) "
 
-#: g10/keyedit.c:1934
-msgid "You may not add a photo ID to a PGP2-style key.\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"
+"         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
+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:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "Introduzca la longitud de la clave"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selección de las claves secretas.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:1955
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:1997
 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:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:2467
-#, fuzzy
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
-msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
+msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "clave %08lX: autofirma inválida\n"
-
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2284
 #, 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:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el índice %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3178,258 +3010,243 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2839
-#, fuzzy, c-format
+#: g10/keyedit.c:2452
+#, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
 "\"\n"
-"firmada con su clave %08lX el %s\n"
+"firmada localmente con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2844
-#, fuzzy, c-format
+#: g10/keyedit.c:2457
+#, c-format
 msgid "This signature expired on %s.\n"
-msgstr "firma %s de: %s\n"
+msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:2848
-#, fuzzy
+#: g10/keyedit.c:2461
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "¿De verdad quiere revocar esta clave? "
+msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:2852
-#, fuzzy
+#: g10/keyedit.c:2465
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "¿Crear un certificado de revocación para esta clave (s/N)?"
+msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:2891
-#, fuzzy, c-format
+#: g10/keyedit.c:2504
+#, c-format
 msgid "   signed by %08lX at %s%s%s\n"
-msgstr "   firmada por %08lX el %s\n"
+msgstr "   firmada por %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:2929
-#, fuzzy, c-format
+#: g10/keyedit.c:2542
+#, c-format
 msgid "   signed by %08lX at %s%s\n"
-msgstr "   firmada por %08lX el %s\n"
+msgstr "   firmada por %08lX el %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
-msgstr ""
+msgstr " (no exportable)"
 
-#: g10/keyedit.c:2938
-#, fuzzy
+#: g10/keyedit.c:2551
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "¿Crear los certificados de revocación realmente? (s/N)"
+msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr ""
+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 "firma %s de: %s\n"
-
-#: g10/keylist.c:93
-#, fuzzy
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
-msgstr "firma %s de: %s\n"
+msgstr "Política de firmas: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación inválidos\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "Notación: "
-
-#: g10/keylist.c:129
-#, fuzzy
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
-msgstr "Notación: "
+msgstr "Notación de firma: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
-msgstr ""
+msgstr "ilegible"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
-msgstr ""
+msgstr "Anillo de claves"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
-msgstr " [caduca el %s]"
+msgstr " [caduca: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "Fingerprint:"
 msgstr "Huella dactilar:"
 
 #. 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
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
-#: g10/keylist.c:962
-#, fuzzy
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
-msgstr "         Huella dactilar:"
+msgstr "    Huella de clave ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave pública es %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave pública: DEK correcta\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:378
 #, 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:419
+#: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
-#, fuzzy, c-format
+#: g10/mainproc.c:429 g10/mainproc.c:448
+#, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "datos cifrados %s\n"
+msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr ""
+msgstr "cifrado IDEA indisponible, optimistamente intentando usar %s en su lugar\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 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:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas múltiples\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, 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:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
-#, fuzzy
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
-msgstr "Firma correcta de \""
+msgstr "Firma caducada de \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
-msgstr ""
+msgstr "[incierto]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz inválido detectado en proc_tree()\n"
 
@@ -3444,50 +3261,32 @@ 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:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr ""
+msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr ""
+msgstr "Aviso: permisos inseguros de %s \"%s\"\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "el plugin para el cifrado IDEA no está presente\n"
 
-#: 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 "ATENCIÓN `%s' es un fichero vacío\n"
-
-#: g10/misc.c:656
-#, fuzzy, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATENCIÓN `%s' es un fichero vacío\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:658
-#, c-format
-msgid "please use \"%s%s\" instead\n"
-msgstr ""
-
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
 #, 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:1057
+#: g10/parse-packet.c:1053
 #, 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"
@@ -3498,24 +3297,24 @@ msgstr "el agente gpg no esta disponible en esta sesión\n"
 
 #: g10/passphrase.c:450
 msgid "can't set client pid for the agent\n"
-msgstr ""
+msgstr "no puedo establecer pid para el agente\n"
 
 #: g10/passphrase.c:458
 msgid "can't get server read FD for the agent\n"
-msgstr ""
+msgstr "no puedo conseguir el FD de lectura para el agente\n"
 
 #: g10/passphrase.c:465
 msgid "can't get server write FD for the agent\n"
-msgstr ""
+msgstr "no puedo conseguir el FD de escritura para el agente\n"
 
 #: g10/passphrase.c:498
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
 #: g10/passphrase.c:511
-#, fuzzy, c-format
+#, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "el algoritmo de protección %d no puede ser utilizado\n"
+msgstr "el programa no permite usar el protocolo agente gpg versión %d\n"
 
 #: g10/hkp.c:147 g10/passphrase.c:532
 #, c-format
@@ -3524,12 +3323,11 @@ msgstr "no se puede conectar con `%s': %s\n"
 
 #: g10/passphrase.c:554
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "problema de comunicación con el agente gpg\n"
 
 #: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
-#, fuzzy
 msgid "problem with the agent - disabling agent use\n"
-msgstr "problema con el agente: el agente devuelve 0x%lx\n"
+msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
 #: g10/passphrase.c:631 g10/passphrase.c:1017
 #, c-format
@@ -3544,8 +3342,8 @@ msgid ""
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
 "Necesita una contraseña para desbloquear la clave secreta\n"
-"del usuario: \"%2$.*1$s\"\n"
-"clave %4$s de %3$u bits, ID %5$08lX, creada el %6$s%7$s\n"
+"del usuario: \"%.*s\"\n"
+"%u bits, clave %s, ID %08lX, creada el %s%s\n"
 
 #: g10/passphrase.c:662
 msgid "Enter passphrase\n"
@@ -3604,9 +3402,9 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n"
 
 #: g10/plaintext.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "error creating `%s': %s\n"
-msgstr "error leyendo `%s': %s\n"
+msgstr "error creando `%s': %s\n"
 
 #: g10/plaintext.c:337
 msgid "Detached signature.\n"
@@ -3629,44 +3427,39 @@ 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:101
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:100
+#, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "destinatario anónimo, probando clave secreta %08lX ...\n"
+msgstr "destinatario anónimo; probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 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:178
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:177
+#, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "algoritmo de cifrado %d desconocido o desactivado\n"
+msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:221
+#: g10/pubkey-enc.c:220
 #, 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:243
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave secreta %08lX caducada el %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
-msgid "NOTE: key has been revoked"
-msgstr "clave %08lX: ¡esta clave ha sido revocada!\n"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %08lX from HKP keyserver %s\n"
-msgstr "solicitando clave %08lX de %s ...\n"
+msgstr "solicitando clave %08lX del servidor de claves HKP %s\n"
 
 #: g10/hkp.c:94
 #, c-format
@@ -3688,38 +3481,33 @@ msgstr "envió correcto a `%s` (estado=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "falló el envio a `%s': status=%u\n"
 
-#: g10/hkp.c:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
+msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/hkp.c:543
-#, fuzzy, c-format
+#: g10/hkp.c:521
+#, c-format
 msgid "can't search keyserver: %s\n"
-msgstr "no puede obtenerse la clave en el servidor: %s\n"
+msgstr "no puede buscarse en el servidor: %s\n"
 
 #: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no están disponibles\n"
 
 #: g10/seckey-cert.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "el algoritmo de protección %d no puede ser utilizado\n"
+msgstr "el algoritmo de protección %d%s no puede ser utilizado\n"
 
 #: g10/seckey-cert.c:215
-#, fuzzy
 msgid "Invalid passphrase; please try again"
-msgstr "Contraseña incorrecta, inténtelo de nuevo...\n"
+msgstr "Contraseña incorrecta; inténtelo de nuevo."
 
 #: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
-msgstr ""
+msgstr "%s ... \n"
 
 #: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
@@ -3728,13 +3516,12 @@ msgstr "ATENCIÓN: detectada clave débil - por favor cambie la contraseña.\n"
 #: g10/seckey-cert.c:311
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 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"
+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
 #, c-format
@@ -3755,58 +3542,47 @@ msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
 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:103
-#, c-format
-msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr ""
-
-#: g10/sign.c:151
+#: g10/sign.c:115
 #, c-format
-msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr ""
+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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobación de la firma creada falló: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCIÓN `%s' es un fichero vacío\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:618
+msgid "you can only 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:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: 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
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr ""
+msgstr "sólo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1029
-#, fuzzy, c-format
+#: g10/sign.c:953
+#, c-format
 msgid "%s encryption will be used\n"
-msgstr "descifrado fallido: %s\n"
+msgstr "se usará un cifrado %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3826,8 +3602,7 @@ 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"
@@ -3849,7 +3624,7 @@ msgid "%s: can't create lock\n"
 msgstr "%s: no se puede crear bloqueo\n"
 
 #: g10/tdbio.c:480 g10/tdbio.c:544
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: no se puede crear bloqueo\n"
 
@@ -3888,8 +3663,7 @@ 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"
@@ -3951,19 +3725,19 @@ msgstr ""
 "\"gpg --fix-trust-db\".\n"
 
 #: g10/trustdb.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave válido\n"
 
 #: g10/trustdb.c:235
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: accepted as trusted key\n"
-msgstr "clave %08lX: aceptada como clave de confianza.\n"
+msgstr "clave %08lX: aceptada como clave de confianza\n"
 
 #: g10/trustdb.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n"
+msgstr "clave %08lX aparece más de una vez en la base de datos de confianza\n"
 
 #: g10/trustdb.c:290
 #, c-format
@@ -3976,9 +3750,9 @@ msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petición tipo %d: fallo lectura: %s\n"
 
 #: g10/trustdb.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "registro de confianza %lu: fallo al borrar: %s\n"
+msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
 #: g10/trustdb.c:353
 #, c-format
@@ -3991,34 +3765,32 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronización: %s\n"
 
 #: g10/trustdb.c:468
-#, fuzzy
 msgid "no need for a trustdb check\n"
-msgstr "%s: no es una base de datos de confianza\n"
+msgstr "no es necesaria una comprobación de la base de datos de confianza\n"
 
 #: g10/trustdb.c:474 g10/trustdb.c:1641
-#, fuzzy, c-format
+#, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "inserción del registro de confianza fallida: %s\n"
+msgstr "siguiente comprobación de base de datos de confianza el: %s\n"
 
 #: g10/trustdb.c:779
-#, fuzzy
 msgid "checking the trustdb\n"
-msgstr "cambia valores de confianza"
+msgstr "comprobando base de datos de confianza\n"
 
 #: g10/trustdb.c:933
-#, fuzzy, c-format
+#, c-format
 msgid "public key %08lX not found: %s\n"
-msgstr "Clave pública no encontrada"
+msgstr "clave pública %08lX no encontrada: %s\n"
 
 #: g10/trustdb.c:1515
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr ""
+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 ""
+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 ""
@@ -4035,32 +3807,28 @@ 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:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 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:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' omitido: duplicado\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' omitido: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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
@@ -4110,10 +3878,8 @@ 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"
@@ -4126,13 +3892,11 @@ 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 ""
+msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
@@ -4147,23 +3911,22 @@ msgid "This is a secret key! - really delete? "
 msgstr "¡Esta es una clave secreta! ¿Eliminar realmente? "
 
 #: g10/delkey.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "enumeración de bloques de clave fallida: %s\n"
+msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
 #: g10/delkey.c:166
 msgid "ownertrust information cleared\n"
-msgstr ""
+msgstr "borrada información de propietarios\n"
 
 #: g10/delkey.c:194
-#, fuzzy, c-format
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "¡hay una clave secreta para esta clave pública!\n"
+msgstr "¡hay una clave secreta para esta clave pública! \"%s\"!\n"
 
 #: g10/delkey.c:196
-#, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "use la opción \"--delete-secret-key\" para borrarla antes.\n"
+msgstr "use antes la opción \"--delete-secret-key\" para borrarla.\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -4182,6 +3945,10 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
+"Para construir la Red-de-Confianza, GnuPG necesita saber qué claves\n"
+"tienen confianza total - normalmente son las claves para las que usted\n"
+"puede acceder a la clave secreta. Conteste \"yes\" para hacer que esta\n"
+"clave se considere como de total confianza\n"
 
 #: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
@@ -4192,8 +3959,7 @@ 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
@@ -4205,8 +3971,7 @@ 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"
@@ -4242,23 +4007,15 @@ 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: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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sí\" o \"no\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4270,21 +4027,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentará interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del dueño de la clave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 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:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4298,56 +4055,75 @@ msgstr ""
 "O  para continuar con la generación de clave.\n"
 "S  para interrumpir la generación de clave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 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:162
+#: g10/helptext.c:156
 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 ""
+"Cuando firme un ID de usuario en una clave, debería verificar que la clave\n"
+"pertenece a la persona que se nombra en el ID de usuario. Es útil para\n"
+"otros saber cómo de cuidadosamente lo ha verificado.\n"
+"\n"
+"\"0\" significa que no hace ninguna declaración concreta sobre como ha\n"
+"      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"
+"      para una verificación en persona cuando firmas la clave de un usuario\n"
+"      pseudoanónimo.\n"
+"\n"
+"\"2\" significa que hizo una comprobación informal de la clave. Por ejemplo\n"
+"      podría querer decir que comprobó la huella dactilar de la clave y\n"
+"      comprobó el ID de usuario en la clave con un ID fotográfico.\n"
+"\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"
+"      al poseedor de la clave.\n"
+"\n"
+"Observe que los ejemplos dados en los niveles 2 y 3 son *solo* ejemplos.\n"
+"En definitiva, usted decide lo que significa \"informal\" y \"exhaustivo\"\n"
+"para usted cuando firma las claves de otros.\n"
+"\n"
+"Si no sabe qué contestar, conteste \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:194
 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:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4355,11 +4131,11 @@ msgstr ""
 "Responda \"sí\" si realmente quiere borrar este ID de usuario.\n"
 "¡También se perderán todos los certificados!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:203
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sí\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:208
 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"
@@ -4369,7 +4145,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:219
+#: g10/helptext.c:213
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4381,13 +4157,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:225
+#: g10/helptext.c:219
 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:229
+#: g10/helptext.c:223
 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"
@@ -4400,33 +4176,35 @@ 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:237
+#: g10/helptext.c:231
 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 ""
+"Cambiar las preferencias de todos los IDs de usuario (o sólo los \n"
+"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:244
-#, fuzzy
+#: g10/helptext.c:238
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Por favor introduzca la contraseña"
+msgstr "Por favor introduzca la contraseña: una frase secreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:244
 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:254
+#: g10/helptext.c:248
 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:259
+#: g10/helptext.c:253
 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:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4434,7 +4212,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:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4463,7 +4241,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:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4473,34 +4251,34 @@ 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:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
 #: g10/keydb.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
 #: g10/keydb.c:188
 #, c-format
 msgid "changing permission of  `%s' failed: %s\n"
-msgstr ""
+msgstr "al cambiar permisos de `%s' ocurrió el fallo: %s\n"
 
 #: g10/keydb.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "keyring `%s' created\n"
-msgstr "%s: anillo creado\n"
+msgstr "anillo `%s' creado\n"
 
 #: g10/keydb.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: fallo en la creación de la tabla hash: %s\n"
+msgstr "fallo reconstruyendo caché del anillo de claves: %s\n"
 
 #: g10/keyring.c:1235
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4521,37 +4299,25 @@ msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
 #: g10/keyring.c:1337
-#, fuzzy, c-format
+#, c-format
 msgid "checking keyring `%s'\n"
-msgstr "no puede bloquearse el anillo `%s': %s\n"
+msgstr "comprobando anillo `%s'\n"
 
 #: g10/keyring.c:1368
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "hasta ahora se han procesado %lu claves\n"
+msgstr "hasta ahora procesadas %lu claves (%lu firmas)\n"
 
 #: g10/keyring.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys checked (%lu signatures)\n"
-msgstr "lista claves y firmas"
+msgstr "%lu claves comprobadas (%lu firmas)\n"
 
 #: g10/keyring.c:1441
 #, c-format
 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"
-
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "¿Seguro que quiere una clave de este tamaño? "
@@ -4590,8 +4356,7 @@ 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"
 
@@ -4617,8 +4382,7 @@ 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: "
@@ -4629,6 +4393,9 @@ 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? "
 
@@ -4720,8 +4487,7 @@ 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"
@@ -4817,8 +4583,7 @@ 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"
@@ -4839,12 +4604,8 @@ 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 4b9e9f140..25f70f2f7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-04-22 12:07+0200\n"
+"Project-Id-Version: gnupg 1.0.7\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-05-10 08:47+0300\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "välju"
 
@@ -272,7 +272,7 @@ 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:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
@@ -337,7 +337,7 @@ msgstr ""
 "ÄRGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +348,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:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -356,163 +356,163 @@ msgstr ""
 "@Käsud:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "krüpteeri andmed"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
 msgstr "|[failid]|krüpteeri failid"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "krüpteerimine kasutades ainult sümmeetrilist ¨ifrit"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "ainult salvesta"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "dekrüpteeri andmed (vaikimisi)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
 msgstr "|[failid]|dekrüpteeri failid"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "näita võtmeid"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "näita võtmeid ja allkirju"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "näita võtmeid ja sõrmejälgi"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/g10.c:320
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: g10/g10.c:322
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
 msgstr "eemalda võtmed salajaste võtmete hoidlast"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/g10.c:325
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
 msgstr "allkirjasta võti mitte-tühistatavana"
 
-#: g10/g10.c:326
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
 msgstr "allkirjasta võti lokaalselt ja mitte-tühistatavana"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "allkirjasta või toimeta võtit"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "ekspordi võtmed"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "ekspordi võtmed võtmeserverisse"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/g10.c:334
+#: g10/g10.c:320
 msgid "search for keys on a key server"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: g10/g10.c:336
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
 msgstr "uuenda võtmeid võtmeserverist"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "impordi/mesti võtmed"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "näita ainult pakettide järjendeid"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "ekspordi usalduse väärtused"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "impordi usalduse väärtused"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:350
+#: g10/g10.c:336
 msgid "unattended trust database update"
 msgstr "hooldusvaba usalduse andmebaasi uuendamine"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "paranda vigane usalduse andmebaas"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr "Pakenda fail või standardsisend lahti"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "Pakenda fail või standardsisend"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|trüki teatelühendid"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -522,192 +522,196 @@ msgstr ""
 "Võtmed:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis väljund"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi võtit"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:376
+#: g10/g10.c:362
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "kasuta väljundfailina"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "ole mõnevõrra vaiksem"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "ära kasuta terminali"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: g10/g10.c:390
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
 msgstr "ära kasuta v3 allkirju"
 
-#: g10/g10.c:391
+#: g10/g10.c:377
 msgid "force v4 key signatures"
 msgstr "kasuta v4 võtme allkirju"
 
-#: g10/g10.c:392
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
 msgstr "ära kasuta v3 võtme allkirju"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
 msgstr "krüptimisel kasuta alati MDC"
 
-#: g10/g10.c:395
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
 msgstr "krüptimisel ära kasuta kunagi MDC"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "ära tee mingeid muutusi"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "kasuta gpg-agenti"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "pakettmood: ära küsi kunagi"
 
-#: g10/g10.c:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr "eelda enamus küsimustele jah vastust"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr "eelda enamus küsimustele ei vastust"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste võtmete hoidla nimekirja"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda võtmeserverit"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr "loe võtmed failist"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/g10.c:418
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
 msgstr "|[fail]|kirjuta olekuinfo faili"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|VÕTMEID|usalda seda võtit täielikult"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "kasuta kõikides tegevustes OpenPGP võtmeid"
 
-#: g10/g10.c:434
+#: g10/g10.c:414
 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:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|kasuta parooli moodi N"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega lühendialgoritmi NIMI"
 
-#: g10/g10.c:444
+#: g10/g10.c:422
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega ¨ifri algoritmi NIMI"
 
-#: g10/g10.c:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta ¨ifri algoritmi NIMI"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr "ära lisa krüptimisel võtme id"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
 msgstr "Esita foto IDd"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
 msgstr "Ei esita foto IDd"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
 msgstr "Sea käsurida foto ID vaatamiseks"
 
-#: g10/g10.c:459
+#: g10/g10.c:431
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|NIMI=VÄÄRTUS|kasuta neid noteerimise andmeid"
+
+#: g10/g10.c:434
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -715,7 +719,7 @@ msgstr ""
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -735,15 +739,15 @@ msgstr ""
 " --list-keys [nimed]        näita võtmeid\n"
 " --fingerprint [nimed]      näita sõrmejälgi\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -753,7 +757,7 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -761,276 +765,258 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "võtmete fail `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/g10.c:1340
+#: 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:1476
+#: 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:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
+
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
 
-#: g10/g10.c:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 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:1525
+#: g10/g10.c:1395
 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:1531
+#: g10/g10.c:1401
 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:1544
+#: g10/g10.c:1414
 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:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
 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:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud ¨ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: g10/g10.c:1499
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 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:1637
+#: g10/g10.c:1508
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1512
 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:1645
+#: g10/g10.c:1516
 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:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "vigased eelistused\n"
-
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "vigased eelistused\n"
-
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "vigased eelistused\n"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
 msgstr "vigased eelistused\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/g10.c:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [käsud]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ei õnnestu avada: %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane teatelühendi algoritm `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2101
 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:2260 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 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:2474
-#, fuzzy
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\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"
 msgstr ""
 "noteerimise nimes võivad olla ainult tähed, numbrid, punktid ja alakriipsud\n"
 "ning lõpus peab olema '='\n"
 
-#: g10/g10.c:2483
+#: 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
 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:2520
-msgid "the given certification policy URL is invalid\n"
-msgstr "antud sertifikaadi poliisi URL on vigane\n"
-
-#: g10/g10.c:2522
-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"
@@ -1100,10 +1086,8 @@ 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"
@@ -1126,13 +1110,11 @@ msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "Tühistamise põhjus: "
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "Tühistamise kommentaar: "
 
 #. a string with valid answers
@@ -1235,8 +1217,7 @@ 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
@@ -1302,8 +1283,7 @@ 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
@@ -1315,31 +1295,28 @@ 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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, 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:803
+#: g10/pkclist.c:752
 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:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1347,130 +1324,120 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  Lõpetage tühja reaga: "
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 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:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "Avalik võti on blokeeritud.\n"
 
-#: g10/pkclist.c:862
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "eelistus %c%lu ei ole lubatud\n"
 
-#: g10/keygen.c:189
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:194
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:257
 msgid "invalid character in preference string\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/keygen.c:524
-#, fuzzy
-msgid "writing direct signature\n"
-msgstr "kirjutan iseenda allkirja\n"
-
-#: g10/keygen.c:563
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "kirjutan võtit siduva allkirja\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "võtme suurus ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (allkirjastamiseks ja krüptimiseks)\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: 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:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1483,19 +1450,19 @@ msgstr ""
 "            vaikimisi võtmepikkus on 1024 bitti\n"
 "    suurim soovitatav võtmepikkus on 2048 bitti\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA lubab võtmepikkuseid ainult vahemikus 512 kuni 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:852
 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:1030
+#: g10/keygen.c:855
 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"
 
@@ -1507,12 +1474,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:1041
+#: g10/keygen.c:866
 #, 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:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1520,29 +1487,27 @@ msgstr ""
 "Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n"
 "arvutused võtavad VÄGA palju aega!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Olete kindel, et soovite sellist võtmepikkust? "
 
-#: g10/keygen.c:1050
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:875
+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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud võtmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1558,7 +1523,7 @@ msgstr ""
 "      <n>m = võti aegub n kuuga\n"
 "      <n>y = võti aegub n aastaga\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1574,30 +1539,30 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Võti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:985
 #, 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:1167
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1605,15 +1570,14 @@ msgstr ""
 "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
 "Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "On see õige (j/e)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -1624,44 +1588,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Pärisnimi: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei või alata numbriga\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu sümbol kommentaaris\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1672,27 +1636,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 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:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 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:1327
+#: g10/keygen.c:1152
 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:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Palun parandage kõigepealt viga\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1700,16 +1664,16 @@ msgstr ""
 "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:701 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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"
@@ -1721,7 +1685,7 @@ msgstr ""
 "kasutades seda programmi võtmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1246
 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"
@@ -1733,53 +1697,53 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Võtme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku võtme faili `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2253
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "võti on märgitud abslouutselt usaldatuks.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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"
@@ -1788,112 +1752,97 @@ msgstr ""
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 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:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "Loon tõesti? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
 msgstr "võti --output ei tööta selle käsuga\n"
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:92 g10/encode.c:296
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
-#: g10/tdbio.c:552
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: HOIATUS: tühi fail\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 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:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:402
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:347
+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:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 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:646
+#: g10/encode.c:563
 #, 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/keyedit.c:2211
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, 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:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "võti %08lX: ei ole kaitstud - jätsin vahele\n"
 
-#: g10/export.c:196
+#: g10/export.c:188
 #, 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:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
@@ -1903,23 +1852,21 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1360
 #, 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:2100
+#: g10/getkey.c:1989
 #, 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:2147
+#: g10/getkey.c:2036
 #, 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"
@@ -1999,184 +1946,177 @@ msgstr " salajasi võtmeid imporditud: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi võtmeid: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "võti %08lX: vigane alamvõtme seos\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:544
+#: g10/import.c:455
 #, 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:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 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:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, 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:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "võti %08lX: uus võti - jätsin vahele\n"
 
-#: g10/import.c:578
+#: g10/import.c:489
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "võti %08lX: avalik võti on imporditud\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "võti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, 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:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, 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:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "võti %08lX: 1 uus kasutaja ID\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "võti %08lX: %d uut kasutaja IDd\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "võti %08lX: 1 uus allkiri\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "võti %08lX: %d uut allkirja\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "võti %08lX: 1 uus alamvõti\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "võti %08lX: %d uut alamvõtit\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "võti %08lX: ei muudetud\n"
 
-#: g10/import.c:770
+#: g10/import.c:671
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, 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:785
+#: g10/import.c:686
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "võti %08lX: on juba salajaste võtmete hoidlas\n"
 
-#: g10/import.c:790
+#: g10/import.c:691
 #, 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:819
+#: g10/import.c:720
 #, 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:859
+#: g10/import.c:760
 #, 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:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "võti %08lX: tühistamise sertifikaat imporditud\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:941
+#: g10/import.c:839
 #, 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:943
+#: g10/import.c:841
 #, 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:960
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
 
-#: g10/import.c:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "võti %08lX: vigane alamvõtme seos\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "võti %08lX: jätsin vahele kasutaja ID '"
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "võti %08lX: jätsin alamvõtme vahele\n"
@@ -2185,128 +2125,106 @@ 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:1047
+#: g10/import.c:945
 #, 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:1056
+#: g10/import.c:954
 #, 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:1073
+#: g10/import.c:971
 #, 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:1174
+#: g10/import.c:1072
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1233
+#: 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"
+msgstr "Hoiatus: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
 
-#: g10/import.c:1247
+#: 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"
+msgstr "Hoiatus: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
 
-#: g10/import.c:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "võti %08lX: tühistamise sertifikaat lisatud\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1231
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[tühistamine]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 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:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, 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:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri jäi vea tõttu kontrollimata\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja jäi vigade tõttu kontrollimata\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:226
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin ühe kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:335
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
 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:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:376
-#, c-format
-msgid "Warning: user ID \"%s\" is not self-signed.\n"
-msgstr ""
-
-#: g10/keyedit.c:395
-#, 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:404
-#, 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:418
+#: g10/keyedit.c:364
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2315,80 +2233,76 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:368
 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:442
+#: g10/keyedit.c:388
 #, 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:446
+#: g10/keyedit.c:393
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:420
 msgid "This key has expired!"
 msgstr "See võti on aegunud!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:440
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See võti aegub %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:444
 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:531
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\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 "--pgp2 moodis ei saa PGP 2.x võtmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:479
 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:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole üldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, 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:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2396,32 +2310,7 @@ msgstr ""
 "Olete tõesti kindel, et soovite seda võtit oma\n"
 "võtmega allkirjastada: \""
 
-#: g10/keyedit.c:600
-#, fuzzy
-msgid ""
-"\n"
-"This will be a self-signature.\n"
-msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
-
-#: g10/keyedit.c:604
-#, 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:609
-#, 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:616
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2429,7 +2318,7 @@ msgstr ""
 "\n"
 "Allkiri märgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2437,7 +2326,7 @@ msgstr ""
 "\n"
 "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2445,7 +2334,7 @@ msgstr ""
 "\n"
 "Ma ei ole seda võtit üldse kontrollinud.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2453,7 +2342,7 @@ msgstr ""
 "\n"
 "Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2461,33 +2350,33 @@ msgstr ""
 "\n"
 "Ma olen kontrollinud seda võtit väga hoolikalt.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "See võti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "Võti on kaitstud.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda võtit ei õnnestu toimetada: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2495,7 +2384,7 @@ msgstr ""
 "Sisestage sellele salajasele võtmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2503,578 +2392,552 @@ msgstr ""
 "Te ei soovi parooli - see on tõenäoliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "Kas te tõesti soovite seda teha? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "tõstan võtme allkirja õigesse kohta\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "salvesta ja välju"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "näita võtit ja kasutaja IDd"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "vali sekundaarne võti N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "näita allkirju"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
 msgstr "allkirjasta võti"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
 msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
 msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
 msgstr "lisa foto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "lisa sekundaarne võti"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne võti"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "addkey"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "lisa sekundaarne võti"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
 msgstr "primaarne"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
 msgstr "märgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "lülita"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle between secret and public key listing"
 msgstr "lülita salajaste või avalike võtmete loendi vahel"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
 msgstr "näita eelistusi (ekspert)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
 msgstr "näita eelistusi (detailsena)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "set preference list"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updated preferences"
 msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "tühista allkirjad"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "tühista sekundaarne võti"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "blokeeri võti"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "luba võti"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
 msgstr "näita foto ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:913
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "Käsklus> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast võtit.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1047
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1092
 #, 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:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "Kas te tõesti soovite seda võtit kustutada? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1183
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te tõesti soovite seda võtit tühistada? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1252
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
 msgstr "Kas tõesti uuendan seaded? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:1489
+#, c-format
+msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Selle võtme võib olla tühistanud %s võti %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, 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:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamvõti on tühistatud: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud võltsitud tühistamine\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1827
-msgid "There are no preferences on a PGP 2.x-style key.\n"
-msgstr ""
-
-#: g10/keyedit.c:1835
-#, fuzzy
+#: g10/keyedit.c:1574
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
+"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:1660
+msgid ""
+"WARNING: This key already has a photo ID.\n"
+"         Adding another photo ID may confuse some versions of PGP.\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"
+"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:1923
+#: 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"
+
+#: 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 ""
 "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:1928
-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:1934
+#: g10/keyedit.c:1697
 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:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "Sisestage võtmepikkus"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige ülimalt üks sekundaarne võti.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:1955
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:1997
 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:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, 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:2671
+#: g10/keyedit.c:2284
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne võti numbriga %d puudub\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3083,7 +2946,7 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2452
 #, c-format
 msgid ""
 "\"\n"
@@ -3092,242 +2955,234 @@ msgstr ""
 "\"\n"
 "lokaalselt allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2457
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2461
 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:2852
+#: g10/keyedit.c:2465
 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:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2504
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2542
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2551
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, 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"
 
-#: g10/keylist.c:91
-#, fuzzy
-msgid "Critical signature policy: "
-msgstr "Allkirja poliitika: "
-
-#: g10/keylist.c:93
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "Allkirja noteerimine: "
-
-#: g10/keylist.c:129
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
 msgstr "Võtmehoidla"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "Fingerprint:"
 msgstr "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:958
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "               Sõrmejälg:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
 msgstr "     Võtme sõrmejälg ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krüpteeritud andmed\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "avalik võti on %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:378
 #, 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:419
+#: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:429 g10/mainproc.c:448
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s krüpteeritud andmeid\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, 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:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Noteering: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Poliis: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei õnnestu töödelda\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, 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:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -3342,49 +3197,32 @@ 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:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA ¨ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:444
-msgid ""
-"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:436
+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/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
+#: g10/parse-packet.c:119
 #, 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:1057
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
@@ -3525,39 +3363,34 @@ 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:101
+#: g10/pubkey-enc.c:100
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonüümne saaja; proovin salajast võtit %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anonüümne teate saaja.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:177
 #, 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:221
+#: g10/pubkey-enc.c:220
 #, 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:243
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
-msgid "NOTE: key has been revoked"
-msgstr "võti %08lX: võti on tühistatud!\n"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3584,16 +3417,12 @@ msgstr "teate saatmine serverile `%s' õnnestus (olek=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "teate saatmine serverile `%s' ebaõnnestus: olek=%u\n"
 
-#: g10/hkp.c:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:521
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "võtmeserverist ei saa otsida: %s\n"
@@ -3622,14 +3451,11 @@ 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"
+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
 #, c-format
@@ -3650,61 +3476,44 @@ msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti tõttu vigast allkirja\n"
 
-#: 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
+#: g10/sign.c:115
 #, 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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s allkiri kasutajalt: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on tühi fail\n"
 
-#: g10/sign.c:644
-#, fuzzy
-msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:618
+msgid "you can only 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:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: 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
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 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:1029
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s krüpteerimist\n"
@@ -3788,8 +3597,7 @@ 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"
@@ -3914,8 +3722,7 @@ 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 ""
@@ -3932,30 +3739,27 @@ 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:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 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:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' jätsin vahele: duplikaat\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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"
@@ -4008,8 +3812,7 @@ 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
@@ -4023,9 +3826,7 @@ 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"
@@ -4088,12 +3889,10 @@ 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
@@ -4105,8 +3904,7 @@ 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"
@@ -4143,23 +3941,15 @@ msgstr ""
 "kasutamine soovitatav, kuna mitte kõik programmid ei toeta neid\n"
 "ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
 
-#: 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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "Sisestage võtmepikkus"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" või \"ei\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4171,19 +3961,19 @@ msgstr ""
 "saa korrektset veateadet, kuna süsteem üritab antud väärtust\n"
 "tõlgendada vahemikuna."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "Sisestage võtmehoidja nimi"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 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:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "Te võite nüüd sisestada kommentaari"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4197,46 +3987,36 @@ msgstr ""
 "O  et jätkata võtme loomist.\n"
 "V  et lõpetada võtme loomine."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 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:162
+#: g10/helptext.c:156
 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\"."
@@ -4247,36 +4027,32 @@ 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:200
+#: g10/helptext.c:194
 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:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4284,11 +4060,11 @@ msgstr ""
 "Kui te tõesti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:203
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamvõtme võib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:214
+#: g10/helptext.c:208
 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"
@@ -4298,7 +4074,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:219
+#: g10/helptext.c:213
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4310,13 +4086,13 @@ msgstr ""
 "kasutab, sest see võti võib moodustada usaldussuhte läbi mõne juba\n"
 "sertifitseeritud võtme."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:219
 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:229
+#: g10/helptext.c:223
 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"
@@ -4330,7 +4106,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:237
+#: g10/helptext.c:231
 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"
@@ -4340,23 +4116,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:244
+#: g10/helptext.c:238
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:244
 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:254
+#: g10/helptext.c:248
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:253
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili võib üle kirjutada"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4364,7 +4140,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4390,10 +4166,9 @@ 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:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4403,11 +4178,11 @@ msgstr ""
 "soovite seda tühistamise sertifikaati esitada. Palun kirjutage\n"
 "lühidalt. Tühi rida lõpetab teksti.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
@@ -4469,25 +4244,3 @@ 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"
diff --git a/po/fr.po b/po/fr.po
index 7a38a39ba..427da3234 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,9 +9,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-03-28 23:43+01:00\n"
+"Project-Id-Version: gnupg 1.0.7\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-06-24 02:06+02:00\n"
 "Last-Translator: Gaël Quéri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "quitter"
 
@@ -279,7 +279,7 @@ 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:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -330,8 +330,7 @@ msgstr "impossible de fermer `%s': %s\n"
 
 #: cipher/random.c:662
 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
 msgid ""
@@ -347,7 +346,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONNÉES GÉNÉRÉES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -358,7 +357,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:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -366,163 +365,163 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
 msgstr "[fichier]|chiffrer les fichiers"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
 msgstr "|[fichiers]|déchiffrer les fichiers"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "lister les clés"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "lister les clés et les signatures"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "vérifier les signatures des clés"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "lister les clés et les empreintes"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "lister les clés secrètes"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clés"
 
-#: g10/g10.c:320
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
 msgstr "enlever les clés du porte-clés public"
 
-#: g10/g10.c:322
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
 msgstr "enlever les clés du porte-clés secret"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "signer une clé"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "signer une clé localement"
 
-#: g10/g10.c:325
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
 msgstr "signer une clé irrévocablement"
 
-#: g10/g10.c:326
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
 msgstr "signer une clé localement et irrévocablement"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clé"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "exporter les clés"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "exporter les clés vers un serveur de clés"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "importer les clés d'un serveur de clés"
 
-#: g10/g10.c:334
+#: g10/g10.c:320
 msgid "search for keys on a key server"
 msgstr "chercher les clés avec un serveur de clés"
 
-#: g10/g10.c:336
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clés depuis un serveur"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "importer/fusionner les clés"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/g10.c:350
+#: g10/g10.c:336
 msgid "unattended trust database update"
 msgstr "mise à jour inattendue de la base de confiance"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "réparer une base de confiance corrompue"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure à un fichier ou à stdin"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,199 +531,203 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "créer une sortie ascii avec armure"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme récipient par défaut"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "utiliser la clé par déf. comme récipient"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou déchiffrer"
 
-#: g10/g10.c:376
+#: g10/g10.c:362
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/g10.c:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:390
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
 msgstr "ne pas forcer les signatures en v3"
 
-#: g10/g10.c:391
+#: g10/g10.c:377
 msgid "force v4 key signatures"
 msgstr "forcer les signatures en v4"
 
-#: g10/g10.c:392
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
 msgstr "ne pas forcer les signatures en v4"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:395
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
 msgstr ""
 "ne jamais utiliser de sceau pour le\n"
 "chiffrement"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "utiliser gpg-agent"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr "répondre oui à la plupart des questions"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr "répondre non à la plupart des questions"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-clés à la liste"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-clés secret à la liste"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
 msgstr "indiquer où est une clé listée"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme clé secrète par défaut"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HÔTE|utiliser ce serveur pour chercher des clés"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caractères NOM"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
-#: g10/g10.c:418
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
 msgstr "|[fichier]|écrire les informations d'état vers ce fichier"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCLÉ|donner une confiance ultime à cette clé"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode décrit dans la RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement défini par OpenPGP"
 
-#: g10/g10.c:434
+#: g10/g10.c:414
 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:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:444
+#: g10/g10.c:422
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffrés"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
 msgstr "Montrer les photos d'identité"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
 msgstr "Ne pas montrer les photos d'identité"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Choisir la ligne de commande servant à\n"
 "afficher les photos d'identité"
 
-#: g10/g10.c:459
+#: g10/g10.c:431
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|NOM=VALEUR|utiliser ces données de notation"
+
+#: g10/g10.c:434
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -732,7 +735,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste complète des commandes et options)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -752,17 +755,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les clés\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies à <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout problème de traduction à <traduc@traduc.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -772,7 +775,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:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -780,281 +783,264 @@ msgstr ""
 "\n"
 "Algorithmes supportés:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, 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:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, 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:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
 msgstr "impossible d'interpréter l'URI du serveur de clés\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1228
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "impossible de mettre le chemin d'exécution à %s\n"
 
-#: g10/g10.c:1476
+#: 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:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr "utilisez \"--keyserver-options %s\" à la place\n"
+
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, 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:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 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:1525
+#: g10/g10.c:1395
 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:1531
+#: g10/g10.c:1401
 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:1544
+#: g10/g10.c:1414
 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:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
 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:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: 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:1499
 #, 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:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» doit être supérieur à 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» doit être supérieur à 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 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:1637
+#: g10/g10.c:1508
 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:1641
+#: g10/g10.c:1512
 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:1645
+#: g10/g10.c:1516
 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:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "préférences invalides\n"
-
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "préférences invalides\n"
-
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "préférences invalides\n"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
 msgstr "préférences invalides\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a échoué: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a échoué: %s \n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2101
 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:2260 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 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:2474
-#, fuzzy
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\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"
 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:2483
+#: g10/g10.c:2333
 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:2520
-msgid "the given certification policy URL is invalid\n"
-msgstr "l'URL de politique de certification donnée est invalide\n"
-
-#: g10/g10.c:2522
-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"
@@ -1124,8 +1110,7 @@ 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"
@@ -1151,13 +1136,11 @@ msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "Cause de révocation: "
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "Commentaire de révocation: "
 
 #. a string with valid answers
@@ -1259,8 +1242,7 @@ 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
@@ -1323,14 +1305,11 @@ 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"
@@ -1341,35 +1320,31 @@ 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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignoré: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignoré: clé publique déjà présente\n"
 
-#: g10/pkclist.c:803
+#: g10/pkclist.c:752
 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:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1377,136 +1352,124 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 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:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "La clé publique est désactivée.\n"
 
-#: g10/pkclist.c:862
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
 msgstr "ignoré: clé publique déjà activée\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "récipient par défaut `%s' inconnu\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignoré: la clé publique est désactivée\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, 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:189
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "préférence %c%lu dupliquée\n"
 
-#: g10/keygen.c:194
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "trop de préférences `%c'\n"
 
-#: g10/keygen.c:264
-#, fuzzy
+#: g10/keygen.c:257
 msgid "invalid character in preference string\n"
-msgstr "Caractère invalide dans la chaîne\n"
+msgstr "Caractère invalide dans la chaîne de préférences\n"
 
 # g10/keygen.c:123 ???
-#: 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
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "écriture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de liaison\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clé désiré:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par défaut)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signature et chiffrement)\n"
-
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 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:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1519,19 +1482,19 @@ msgstr ""
 "          la taille par défaut est 1024 bits\n"
 " la taille maximale conseillée est 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de clé désirez-vous ? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 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:1027
+#: g10/keygen.c:852
 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:1030
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
@@ -1543,12 +1506,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:1041
+#: g10/keygen.c:866
 #, 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:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1556,29 +1519,27 @@ msgstr ""
 "Les tailles supérieures à 2048 ne sont pas conseillées car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous sûr de vouloir cette taille ? "
 
-#: g10/keygen.c:1050
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:875
+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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1594,7 +1555,7 @@ msgstr ""
 "      <n>m = la clé expire dans n mois\n"
 "      <n>y = la clé expire dans n années\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1610,30 +1571,30 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n années\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "La clé est valide pour ? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:985
 #, 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:1167
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expire le %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1641,15 +1602,14 @@ 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:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -1661,44 +1621,44 @@ msgstr ""
 "   « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nom réel: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caractère invalide dans le nom\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 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:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Caractère invalide dans le commentaire\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères '%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1709,28 +1669,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 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:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 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:1327
+#: g10/keygen.c:1152
 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:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1738,16 +1697,16 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:701 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas été correctement répété ; recommencez."
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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"
@@ -1759,7 +1718,7 @@ msgstr ""
 "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1246
 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"
@@ -1771,55 +1730,53 @@ 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:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de clés DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "La génération de clé a été annulée.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "écriture de la clé publique vers `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "écriture de la clé secrète vers `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:1952
 #, 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:2211
+#: g10/keygen.c:1958
 #, 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:2225
+#: g10/keygen.c:1972
 #, 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:2232
+#: g10/keygen.c:1979
 #, 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:2252
+#: g10/keygen.c:1999
 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:2253
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "clé marquée comme ayant une confiance ultime.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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"
@@ -1828,123 +1785,106 @@ msgstr ""
 "utiliser la commande «--edit-key» pour générer une clé secondaire à\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, 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:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 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:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "Créer vraiment ? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:92 g10/encode.c:296
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' déjà compressé\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
-#: g10/tdbio.c:552
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la création du mot de passe: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 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:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:402
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:347
+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:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 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:646
+#: g10/encode.c:563
 #, 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/keyedit.c:2211
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "clé '%s' introuvable: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de clé : %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, 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:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clé %08lX: non protégée - ignorée\n"
 
-#: g10/export.c:196
+#: g10/export.c:188
 #, 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:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a été exporté\n"
 
@@ -1954,23 +1894,23 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1438
-#, fuzzy, c-format
+#: g10/getkey.c:1360
+#, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "La clé invalide %08lX a été rendu valide par --always-trust\n"
+msgstr "La clé invalide %08lX a été rendue valide par --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2100
+#: g10/getkey.c:1989
 #, 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:2147
+#: g10/getkey.c:2036
 #, 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"
@@ -2050,184 +1990,181 @@ msgstr "       clés secrètes importées: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "      clés secrètes inchangées: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "clé %08lX: liaison avec la sous-clé invalide\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clé %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:544
-#, fuzzy, c-format
+#: g10/import.c:455
+#, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "clé %08lX: utilisateur non signé par lui-même accepté: '"
+msgstr "clé %08lX: nom d'utilisateur non auto-signé accepté '%s':\n"
 
-#: g10/import.c:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clé %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clé %08lX: clé publique pas trouvée: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clé %08lX: nouvelle clé - ignorée\n"
 
-#: g10/import.c:578
+#: g10/import.c:489
 #, 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:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "écriture de `%s'\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'écriture du porte-clés `%s': %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "clé %08lX: clé publique importée\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clé %08lX: ne ressemble pas à notre copie\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, 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:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, 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:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "clé %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "clé %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "clé %08lX: une nouvelle signature\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "clé %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "clé %08lX: une nouvelle sous-clé\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "clé %08lX: %d nouvelles sous-clés\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "clé %08lX: n'a pas changé\n"
 
-#: g10/import.c:770
+#: g10/import.c:671
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-clés par défaut: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, 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:785
+#: g10/import.c:686
 #, 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:790
+#: g10/import.c:691
 #, 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:819
+#: g10/import.c:720
 #, 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:859
+#: g10/import.c:760
 #, 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:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "clé %08lX: certificat de révocation importé\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clé %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:941
-#, fuzzy, c-format
+#: g10/import.c:839
+#, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "clé %08lX: algorithme de clé publique non supporté\n"
+msgstr ""
+"clé %08lX: algorithme de clé publique non supporté sur le nom\n"
+"d'utilisateur \"%s\"\n"
 
-#: g10/import.c:943
-#, fuzzy, c-format
+#: g10/import.c:841
+#, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "clé %08lX: auto-signature invalide\n"
+msgstr "clé %08lX: auto-signature sur le nom d'utilisateur \"%s\" invalide\n"
 
-#: g10/import.c:960
+#: g10/import.c:858
 #, 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:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clé %08lX: algorithme de clé publique non supporté\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clé %08lX: liaison avec la sous-clé invalide\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clé %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clé %08lX: sous-clé non prise en compte\n"
@@ -2236,225 +2173,190 @@ 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:1047
+#: g10/import.c:945
 #, 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:1056
+#: g10/import.c:954
 #, 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:1073
+#: g10/import.c:971
 #, 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:1174
+#: g10/import.c:1072
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clé %08lX: nom d'utilisateur en double fusionné\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1131
 #, 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:1247
+#: g10/import.c:1145
 #, 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:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "clé %08lX: certificat de révocation ajouté\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1231
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "clé %08lX: ajout de la signature de clé directe\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[révocation]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 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:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, 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:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 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:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, 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:227
+#: g10/keyedit.c:226
 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:229
+#: g10/keyedit.c:228
 #, 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:356
-#, fuzzy, c-format
+#: g10/keyedit.c:335
+#, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Le nom d'utilisateur \"%s\" est révoqué.\n"
+msgstr "Le nom d'utilisateur \"%s\" est révoqué."
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
-#, fuzzy
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
+msgstr "Etes-vous sur de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 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:395
-#, 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"
-"\n"
-"Voulez vous la rendre complètement exportable ?\n"
-
-#: g10/keyedit.c:404
-#, fuzzy
-msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr ""
-"Votre signature actuelle sur \"%s\"\n"
-"est locale.\n"
-"\n"
-"Voulez vous la rendre complètement exportable ?\n"
+msgstr "  Impossible de signer.\n"
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
-#, fuzzy, c-format
+#: g10/keyedit.c:364
+#, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 "Votre signature actuelle sur \"%s\"\n"
 "est locale.\n"
-"\n"
-"Voulez vous la rendre complètement exportable ?\n"
 
-#: g10/keyedit.c:422
-#, fuzzy
+#: g10/keyedit.c:368
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr ""
-"Votre signature actuelle sur \"%s\"\n"
-"est locale.\n"
-"\n"
-"Voulez vous la rendre complètement exportable ?\n"
+msgstr "Voulez vous la rendre complètement exportable ? (o/N) "
 
-#: g10/keyedit.c:442
-#, fuzzy, c-format
+#: g10/keyedit.c:388
+#, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "\"%s\" a déjà été %ssigné par la clé %08lX\n"
+msgstr "\"%s\" a déjà été signé localement par la clé %08lX\n"
 
-#: g10/keyedit.c:446
-#, fuzzy, c-format
+#: g10/keyedit.c:393
+#, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "\"%s\" a déjà été %ssigné par la clé %08lX\n"
+msgstr "\"%s\" a déjà été signé localement par la clé %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien à signer avec la clé %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:420
 msgid "This key has expired!"
 msgstr "Cette clé a expiré !"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:440
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette clé va expirer le %s.\n"
 
-#: g10/keyedit.c:498
-#, fuzzy
+#: g10/keyedit.c:444
 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) "
+msgstr "Voulez-vous que votre signature expire en même temps ? (O/n) "
 
-#: g10/keyedit.c:531
-#, fuzzy
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\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 ""
-"il n'est possible de signer avec des clés de style PGP 2.x uniquement\n"
-"en mode --pgp2\n"
+"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:533
-#, fuzzy
+#: g10/keyedit.c:479
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "ce message ne sera pas forcément utilisable par PGP 2.x\n"
+msgstr "Cela rendra la clé inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne répondrai pas.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, 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:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu vérifié.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, 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:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2462,32 +2364,7 @@ msgstr ""
 "Etes-vous vraiment sûr(e) que vous voulez signer cette clé\n"
 "avec la vôtre: \""
 
-#: g10/keyedit.c:600
-#, fuzzy
-msgid ""
-"\n"
-"This will be a self-signature.\n"
-msgstr "cela peut provenir d'une auto-signature manquante\n"
-
-#: g10/keyedit.c:604
-#, 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:609
-#, 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:616
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2495,7 +2372,7 @@ msgstr ""
 "\n"
 "La signature sera marquée comme non-exportable.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2503,7 +2380,7 @@ msgstr ""
 "\n"
 "La signature sera marquée comme non-révocable.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2511,7 +2388,7 @@ msgstr ""
 "\n"
 "Je n'ai pas du tout vérifié cette clé.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2519,7 +2396,7 @@ msgstr ""
 "\n"
 "J'ai un peu vérifié cette clé.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2527,39 +2404,39 @@ msgstr ""
 "\n"
 "J'ai vérifié cette clé avec grand soin.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "Signer réellement ? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a échoué: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "Cette clé n'est pas protégée.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 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:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "La clé est protégée.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'éditer cette clé: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 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:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2568,580 +2445,556 @@ msgstr ""
 "*mauvaise* idée\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une clé à l'endroit correct\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "lister la clé et les noms d'utilisateurs"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "sélectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "clé"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "sélectionner la clé secondaire N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "vérifier"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
 msgstr "signer la clé"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
 msgstr "signer la clé localement"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "nrsign"
 msgstr "nrsigner"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
 msgstr "signer la clé de façon non-révocable"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "nrlsign"
 msgstr "nrlsigner"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
 msgstr "signer la clé de façon locale et non-révocable"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "déboguer"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
 msgstr "aj.photo"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identité"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
 msgstr "suppr.photo"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "aj.clé"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "ajouter une clé secondaire"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "suppr.clé"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "enlever une clé secondaire"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "aj.clé"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "ajouter une clé secondaire"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
 msgstr "principale"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 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:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "préf"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
 msgstr "lister les préférences (expert)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "montr.préf"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
 msgstr "lister les préférences (bavard)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "setpref"
 msgstr "mettre.préf"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "set preference list"
 msgstr "donner la liste de préférences"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updpref"
 msgstr "préf.màj"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updated preferences"
 msgstr "préférences mises à jour"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "révoquer les signatures"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "revclé"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "révoquer une clé secondaire"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "désactiver"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "désactiver une clé"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "activer une clé"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
 msgstr "montr.photo"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
 msgstr "montrer la photo d'identité"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:913
 #, 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:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "La clé secrète est disponible.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la clé secrète pour faire cela.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande «toggle» d'abord.\n"
 
-#: g10/keyedit.c:1130
-#, fuzzy
+#: g10/keyedit.c:1047
 msgid "Key is revoked."
-msgstr "La clé est révoquée.\n"
+msgstr "La clé est révoquée."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: Sélectionner les utilisateurs à signer\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1092
 #, 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:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez sélectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever réellement tous les utilisateurs sélectionnés ? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "Enlever réellement cet utilisateur ? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "Vous devez sélectionner au moins une clé.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette clé ? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 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:1275
+#: g10/keyedit.c:1183
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment révoquer cette clé ? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1252
 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:1346
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
 msgstr "Faut-il vraiment mettre à jour les préférences ? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise à jour a échoué: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise à jour de la clé secrète a échoué: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 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:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez «help»)\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:1489
+#, c-format
+msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Cette clé peut être révoquée par la clé %s %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, 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:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "Cette clé a été désactivée"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, 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:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "rev- une révocation truquée a été trouvée\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, 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:1827
-msgid "There are no preferences on a PGP 2.x-style key.\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 ""
+"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:1835
+#: g10/keyedit.c:1660
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
-"unless you restart the program.\n"
+"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:1923
+#: 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 ""
 "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:1928
-#, fuzzy
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
-
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1697
 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:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprimée.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprimées\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "Entrez la taille de la clé"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les sélections des clés secrètes.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez sélectionner au plus une clé secondaire.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une clé secondaire.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:1955
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la clé principale.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:1997
 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:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-clés secret\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez sélectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "clé %08lX: auto-signature invalide\n"
-
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2284
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de clé secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "nom d'utilisateur: «"
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3150,256 +3003,245 @@ msgstr ""
 "»\n"
 "signé avec votre clé %08lX à %s\n"
 
-#: g10/keyedit.c:2839
-#, fuzzy, c-format
+#: g10/keyedit.c:2452
+#, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
-"»\n"
-"signé avec votre clé %08lX à %s\n"
+"\"\n"
+"signé localement avec votre clé %08lX à %s\n"
 
-#: g10/keyedit.c:2844
-#, fuzzy, c-format
+#: g10/keyedit.c:2457
+#, c-format
 msgid "This signature expired on %s.\n"
-msgstr "Cette clé va expirer le %s.\n"
+msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:2848
-#, fuzzy
+#: g10/keyedit.c:2461
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
+msgstr "Etes-vous sur de vouloir toujours le révoquer ? (y/N) "
 
-#: g10/keyedit.c:2852
-#, fuzzy
+#: g10/keyedit.c:2465
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Générer un certificat de révocation pour cette signature ? (o/N)"
+msgstr "Générer un certificat de révocation pour cette signature ? (o/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez signé ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:2891
-#, fuzzy, c-format
+#: g10/keyedit.c:2504
+#, c-format
 msgid "   signed by %08lX at %s%s%s\n"
-msgstr "   signé par %08lX à %s%s\n"
+msgstr "   signé par %08lX à %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   révoqué par %08lX à %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2542
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signé par %08lX à %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
-msgstr ""
+msgstr " (non-exportable)"
 
-#: g10/keyedit.c:2938
-#, fuzzy
+#: g10/keyedit.c:2551
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
+msgstr "Créer réellement les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "pas de clé secrète\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, 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 "Politique de signature: "
+msgstr "Affichage %s photo d'identité de taille %ld pour la clé 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:93
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des données de notation invalides ont été détectées\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "Notation de signature: "
-
-#: g10/keylist.c:129
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
 msgstr "Porte-clés"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "Fingerprint:"
 msgstr "Empreinte:"
 
 #. 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
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "              Empreinte :"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
 msgstr " Empreinte de la clé ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "données chiffrées avec %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clé publique est %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 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:409
+#: g10/mainproc.c:378
 #, 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:419
+#: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffré avec une clé %s, %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le déchiffrement par clé publique a échoué: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:429 g10/mainproc.c:448
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des données chiffrées avec %s\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, 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:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffré a été manipulé !\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le déchiffrement a échoué: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'expéditeur a demandé «pour vos yeux seulement»\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, 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:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Signature expirée de \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas détachée\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide détecté dans proc_tree()\n"
 
@@ -3418,47 +3260,30 @@ msgstr ""
 "Cet algorithme de chiffrement est déconseillé; utilisez-en un\n"
 "plus standard !\n"
 
-#: g10/misc.c:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Attention: propriétaire de %s \"%s\" peu sûr\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Attention: permissions de %s \"%s\" peu sûres\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas présent\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 un fichier vide\n"
-
-#: g10/misc.c:656
-#, fuzzy, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
-
-#: g10/misc.c:658
-#, c-format
-msgid "please use \"%s%s\" instead\n"
-msgstr ""
+#: 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/parse-packet.c:120
+#: g10/parse-packet.c:119
 #, 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:1057
+#: g10/parse-packet.c:1053
 #, 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"
@@ -3479,8 +3304,7 @@ 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"
@@ -3605,41 +3429,34 @@ 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:101
+#: g10/pubkey-enc.c:100
 #, 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:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le récipient anonyme.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 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:178
+#: g10/pubkey-enc.c:177
 #, 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:221
+#: g10/pubkey-enc.c:220
 #, 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:243
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la clé secrète %08lX a expiré le %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"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3666,16 +3483,12 @@ msgstr "l'envoi à `%s' s'est déroulé avec succès (résultat=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi à `%s' a échoué: le résultat est %u\n"
 
-#: g10/hkp.c:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "recherche de \"%s\" du serveur HKP %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:521
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossible de chercher une clé dans le serveur : %s\n"
@@ -3705,10 +3518,11 @@ msgstr "ATTENTION: Clé faible détectée - changez encore le mot de passe.\n"
 #: g10/seckey-cert.c:311
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 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"
+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"
@@ -3734,66 +3548,50 @@ msgstr ""
 "la signature est supposée être fausse car un bit critique est\n"
 "inconnu\n"
 
-#: 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
+#: g10/sign.c:115
 #, 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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de vérifier la signature créée: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/sign.c:644
-#, fuzzy
-msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:618
+msgid "you can only 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:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de créer %s: %s\n"
 
-#: 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
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 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:1029
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilisé\n"
@@ -3816,8 +3614,7 @@ 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"
@@ -3878,8 +3675,7 @@ 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"
@@ -3963,9 +3759,7 @@ 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
@@ -4008,8 +3802,7 @@ 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 ""
@@ -4028,31 +3821,29 @@ 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:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 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:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' a été ignoré: dupliqué\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a été ignoré: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "ignoré: clé secrète déjà présente\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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"
@@ -4107,8 +3898,7 @@ 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"
@@ -4130,7 +3920,7 @@ msgstr ""
 
 #: g10/seskey.c:200
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
+msgstr "DSA nécessite l'utilisation d'un algorithme de hachage de 160 bits\n"
 
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
@@ -4151,7 +3941,7 @@ msgstr "la suppression du bloc de clés a échoué : %s\n"
 
 #: g10/delkey.c:166
 msgid "ownertrust information cleared\n"
-msgstr ""
+msgstr "les informations de confiance au propriétaires ont été effacées\n"
 
 #: g10/delkey.c:194
 #, c-format
@@ -4194,8 +3984,7 @@ 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."
@@ -4209,8 +3998,7 @@ 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"
@@ -4248,23 +4036,15 @@ 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: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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la clé"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "Répondez «oui» ou «non»"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4276,19 +4056,19 @@ msgstr ""
 "mauvais - le système essaierait d'interpréter la valeur donnée comme un\n"
 "intervalle."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propriétaire de la clé"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommandée"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4302,46 +4082,36 @@ msgstr ""
 "O pour continuer à générer la clé.\n"
 "Q pour arrêter de générer de clé."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 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:162
+#: g10/helptext.c:156
 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\"."
@@ -4373,11 +4143,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle réponse est la bonne, répondez \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:194
 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:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4385,11 +4155,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:209
+#: g10/helptext.c:203
 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:214
+#: g10/helptext.c:208
 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"
@@ -4400,7 +4170,7 @@ msgstr ""
 "établir une connection de confiance vers la clé ou une autre clé certifiée\n"
 "par celle-là."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:213
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4412,7 +4182,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:225
+#: g10/helptext.c:219
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4420,7 +4190,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-clés."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:223
 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"
@@ -4434,8 +4204,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:237
-#, fuzzy
+#: g10/helptext.c:231
 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"
@@ -4443,26 +4212,25 @@ msgid ""
 msgstr ""
 "Changer les préférences de tous les noms d'utilisateurs (ou juste\n"
 "ceux qui sont sélectionnés) vers la liste actuelle. La date de toutes\n"
-"les auto-signatures seront avancées d'une seconde.\n"
+"les auto-signatures affectées seront avancées d'une seconde.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:238
 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:250
+#: g10/helptext.c:244
 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:254
+#: g10/helptext.c:248
 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:259
+#: g10/helptext.c:253
 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:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4470,7 +4238,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:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4499,7 +4267,7 @@ msgstr ""
 "      utilisé. Cela sert généralement à indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4509,11 +4277,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:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
@@ -4540,8 +4308,7 @@ 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
@@ -4576,70 +4343,3 @@ 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 "Are you sure you still want to sign it?\n"
-#~ msgstr "Êtes-vous sûr de vouloir le signer ?\n"
-
-#~ msgid "  Are you sure you still want to sign it?\n"
-#~ msgstr " Êtes-vous sûr de vouloir la signer ?\n"
-
-#, fuzzy
-#~ msgid "Really sign? (y/N) "
-#~ msgstr "Signer réellement ? "
-
-#~ msgid "Do you really need such a large keysize? "
-#~ msgstr "Avez-vous réellement besoin d'une taille aussi grande ? "
-
-#~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "clé %08lX: notre copie n'a pas d'auto-signature\n"
-
-#~ msgid "   signed by %08lX at %s\n"
-#~ msgstr "   signé par %08lX à %s\n"
-
-#~ msgid "--delete-secret-key user-id"
-#~ msgstr "--delete-secret-key utilisateur"
-
-#~ msgid "--delete-key user-id"
-#~ msgstr "--delete-key utilisateur"
-
-#~ msgid "--delete-secret-and-public-key user-id"
-#~ msgstr "--delete-secret-and-public-key utilisateur"
-
-#~ msgid "Enter the user ID: "
-#~ msgstr "Entrez le nom d'utilisateur: "
-
-#~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr "ignoré: clé publique configurée par --encrypt-to\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "WARNING: This is a PGP2-style key\n"
-#~ msgstr ""
-#~ "\n"
-#~ "ATTENTION: c'est une clé de style PGP2\n"
diff --git a/po/gl.po b/po/gl.po
index b85508fb6..4b26ac218 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,13 +1,13 @@
 # Galician translation of GNUpg
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Jacobo Tarrio <jtarrio@iname.com>, 2001.
+# Jacobo Tarrio <jtarrio@trasno.net>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2001-07-11 18:17+0200\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@iname.com>\n"
+"Project-Id-Version: gnupg 1.0.7\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-05-14 13:21+0200\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -19,7 +19,7 @@ msgstr "Aviso: ¡úsase unha zona insegura de memoria!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr ""
+msgstr "mire en http://www.gnupg.org/faq.html para obter máis información\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -45,7 +45,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "abandonar"
 
@@ -259,9 +259,8 @@ msgid "unusable secret key"
 msgstr "chave secreta non utilizable"
 
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "erro xeral"
+msgstr "erro do servidor de chaves"
 
 #: util/logger.c:249
 #, c-format
@@ -273,7 +272,7 @@ 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:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -339,7 +338,7 @@ msgstr ""
 "¡NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +350,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:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -359,170 +358,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
-msgstr ""
+msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar só con cifrado simétrico"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "só armacenar"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
-msgstr ""
+msgstr "|[ficheiros]|descifrar ficheiros"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:320
-#, fuzzy
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
-msgstr "borrar unha chave do chaveiro público"
+msgstr "borrar chaves do chaveiro público"
 
-#: g10/g10.c:322
-#, fuzzy
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
-msgstr "borrar unha chave do chaveiro secreto"
+msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:325
-#, fuzzy
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
-msgstr "asinar unha chave localmente"
+msgstr "asinar unha chave de xeito non revocable"
 
-#: g10/g10.c:326
-#, fuzzy
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
-msgstr "asinar unha chave localmente"
+msgstr "asinar unha chave localmente e de xeito non revocable"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:334
-#, fuzzy
+#: g10/g10.c:320
 msgid "search for keys on a key server"
-msgstr "exportar chaves a un servidor de chaves"
+msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/g10.c:336
-#, fuzzy
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
-msgstr "importar chaves dun servidor de chaves"
+msgstr "actualizar tódalas chaves dun servidor de chaves"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "listar só a secuencia de paquetes"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "exporta-los valores de confianza no propietario"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:350
-#, fuzzy
+#: g10/g10.c:336
 msgid "unattended trust database update"
-msgstr "actualiza-la base de datos de confianza"
+msgstr "actualización inatendida da base de datos de confianza"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "amañar unha base de datos de confianza corrompida"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr "Quita-la armadura a un ficheiro ou á entrada estándar"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "Pór armadura a un ficheiro ou á entrada estándar"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,202 +524,196 @@ msgstr ""
 "Opcións:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:376
+#: g10/g10.c:362
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
 
-#: g10/g10.c:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "usar modo de texto canónico"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "usar coma ficheiro de saída"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "ser un pouquiño máis calado"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:390
-#, fuzzy
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
-msgstr "forzar sinaturas v3"
+msgstr "non forzar sinaturas v3"
 
-#: g10/g10.c:391
-#, fuzzy
+#: g10/g10.c:377
 msgid "force v4 key signatures"
-msgstr "forzar sinaturas v3"
+msgstr "forzar sinaturas de chave v4"
 
-#: g10/g10.c:392
-#, fuzzy
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
-msgstr "forzar sinaturas v3"
+msgstr "non forzar sinaturas de chave v4"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: g10/g10.c:395
-#, fuzzy
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
-msgstr "sempre usar un MDC para cifrar"
+msgstr "nunca usar un MDC para cifrar"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "non facer ningún cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "emprega-lo gpg-agent"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: g10/g10.c:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maioría das preguntas"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr "asumir `non' na maioría das preguntas"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro á lista de chaveiros"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto á lista"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
-msgstr ""
+msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr "le-las opcións dun ficheiro"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la información de estado a este DF"
 
-#: g10/g10.c:418
-#, fuzzy
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
-msgstr "|DF|escribi-la información de estado a este DF"
+msgstr "|[ficheiro]|escribi-la información de estado no ficheiro"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCHAVE|confiar absolutamente nesta chave"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr "emula-lo modo descrito no RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 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:434
-#, fuzzy
+#: g10/g10.c:414
 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 "
-"OpenPGP"
+msgstr "axustar tódalas opcións de paquetes, cifrado e resumo ao comportamento PGP 2.x"
 
-#: g10/g10.c:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
 
-#: g10/g10.c:444
+#: g10/g10.c:422
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: g10/g10.c:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresión N"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
-msgstr ""
+msgstr "Amosar Identificacións Fotográficas"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
-msgstr ""
+msgstr "Non amosar Identificacións Fotográficas"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
-msgstr ""
+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:459
+#: g10/g10.c:434
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -735,7 +721,7 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -755,17 +741,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducción a <proxecto@trasno.net>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -775,7 +761,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -783,280 +769,255 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opcións] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, 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:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opcións `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
-msgstr ""
+msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1228
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "non se puido estabrecer exec-path a %s\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:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr "empregue \"--keyserver-options %s\" no seu canto\n"
 
-#: g10/g10.c:1476
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s non é para uso normal!\n"
 
-#: g10/g10.c:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr ""
+msgstr "só pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:1525
+#: g10/g10.c:1395
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr ""
+msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:1531
+#: g10/g10.c:1401
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr ""
+msgstr "debe empregar ficheiros (e non canalizacións) ao traballar con --pgp2 activado.\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1414
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr ""
+msgstr "para cifrar unha mensaxe en modo --pgp2 precísase da cifra IDEA\n"
 
-#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
-msgstr ""
+msgstr "esta mensaxe pode non ser utilizable por PGP 2.x\n"
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: 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:1499
 #, 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:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 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:1637
+#: g10/g10.c:1508
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1512
 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:1645
-#, fuzzy
+#: g10/g10.c:1516
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n"
-
-#: g10/g10.c:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "amosar preferencias"
+msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "amosar preferencias"
-
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "amosar preferencias"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
-msgstr "amosar preferencias"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
+msgstr "preferencias non válidas\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, 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:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:1840
-#, fuzzy
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [ficheiro]"
+msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:1894
-#, fuzzy
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
-msgstr "--sign-key id-de-usuario"
+msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:1902
-#, fuzzy
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
-msgstr "--lsign-key id-de-usuario"
+msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2101
 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:2260 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 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:2474
-#, 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: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:2483
-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: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:2520
-#, fuzzy
-msgid "the given certification policy URL is invalid\n"
-msgstr "o URL de normativa dado non é válido\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:2522
-#, fuzzy
-msgid "the given signature policy URL is invalid\n"
-msgstr "o URL de normativa dado non é válido\n"
+#: g10/g10.c:2333
+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/armor.c:314
 #, c-format
@@ -1127,11 +1088,8 @@ 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"
@@ -1154,75 +1112,66 @@ msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non é válido"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "Motivo para a revocación: "
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "Comentario de revocación: "
 
 #. a string with valid answers
 #: g10/pkclist.c:252
 msgid "iImMqQsS"
-msgstr ""
+msgstr "iImMsSoO"
 
 #: g10/pkclist.c:258
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"Non se asignou un valor de confianza a %lu:\n"
+"Non se asignou un valor de confianza a:\n"
 "%4u%c/%08lX %s \""
 
 #: 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"
 msgstr ""
-"Por favor, decida canto confía neste usuario para verificar\n"
+"Por favor, decida canto confía en que este usuario verifique\n"
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
-"\n"
-" 1 = Non sei\n"
-" 2 = NON confío\n"
-" 3 = Confío un pouco\n"
-" 4 = Confío plenamente\n"
-" i = Por favor, amóseme máis información\n"
 
 #: g10/pkclist.c:273
 #, c-format
 msgid " %d = Don't know\n"
-msgstr ""
+msgstr " %d = Non sei\n"
 
 #: g10/pkclist.c:274
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lX: Esta chave NON é de confianza\n"
+msgstr " %d = NON confío\n"
 
 #: g10/pkclist.c:275
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = Confío marxinalmente\n"
 
 #: g10/pkclist.c:276
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s: non é un ficheiro de base de datos de confianza\n"
+msgstr " %d = Confío totalmente\n"
 
 #: g10/pkclist.c:278
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = Confío absolutamente\n"
 
 #: g10/pkclist.c:279
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = amosar máis información\n"
 
 #: g10/pkclist.c:281
 msgid " m = back to the main menu\n"
@@ -1230,7 +1179,7 @@ msgstr " m = voltar ao menú principal\n"
 
 #: g10/pkclist.c:284
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " o = omitir esta chave\n"
 
 #: g10/pkclist.c:285
 msgid " q = quit\n"
@@ -1241,9 +1190,8 @@ msgid "Your decision? "
 msgstr "¿A súa decisión? "
 
 #: g10/pkclist.c:313
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "¿Seguro de que quere borrar esta chave? "
+msgstr "¿Está seguro de querer dar confianza absoluta a esta chave? "
 
 #: g10/pkclist.c:325
 msgid "Certificates leading to an ultimately trusted key:\n"
@@ -1269,11 +1217,9 @@ msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave caducou\n"
 
 #: g10/pkclist.c:442
-#, fuzzy, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr ""
-"       Non hai indicacións de que a sinatura pertenza ao seu propietario.\n"
+#, 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"
 
 #: g10/pkclist.c:448
 #, c-format
@@ -1326,9 +1272,8 @@ msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: ¡Esta subchave está revocada polo propietario!\n"
 
 #: g10/pkclist.c:574
-#, fuzzy
 msgid "Note: This key has been disabled.\n"
-msgstr "Esta chave está desactivada"
+msgstr "Nota: Esta chave está desactivada.\n"
 
 #: g10/pkclist.c:579
 msgid "Note: This key has expired!\n"
@@ -1339,10 +1284,8 @@ 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"
@@ -1353,166 +1296,149 @@ 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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave pública xa está presente\n"
 
-#: g10/pkclist.c:803
-#, fuzzy
+#: g10/pkclist.c:752
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr ""
-"Non especificou un ID de usuario. (pode empregar \"-r\")\n"
-"\n"
+msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
+"\n"
+"Introduza o ID de usuario. Remate cunha liña en branco: "
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 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:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desactivada.\n"
 
-#: g10/pkclist.c:862
-#, fuzzy
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
-msgstr "%s: omitido: a chave pública xa está presente\n"
+msgstr "omitido: chave pública xa estabrecida\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave pública está desactivada\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "non hai enderezos válidos\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
-msgstr ""
+msgstr "a preferencia %c%lu non é válida\n"
 
-#: g10/keygen.c:189
-#, fuzzy, c-format
+#: g10/keygen.c:187
+#, c-format
 msgid "preference %c%lu duplicated\n"
-msgstr "omítese `%s': duplicada\n"
+msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:194
-#, fuzzy, c-format
+#: g10/keygen.c:192
+#, c-format
 msgid "too many `%c' preferences\n"
-msgstr "amosar preferencias"
+msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:264
-#, fuzzy
+#: g10/keygen.c:257
 msgid "invalid character in preference string\n"
-msgstr "Caracter non válido no nome\n"
+msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/keygen.c:524
-#, fuzzy
-msgid "writing direct signature\n"
-msgstr "escribindo a propia sinatura\n"
-
-#: g10/keygen.c:563
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (asinar e cifrar)\n"
 
-#: g10/keygen.c:949
-#, fuzzy, c-format
+#: g10/keygen.c:784
+#, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (só asinar)\n"
+msgstr "   (%d) RSA (só asinar)\n"
 
-#: g10/keygen.c:951
-#, fuzzy, c-format
-msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (só cifrar)\n"
-
-#: g10/keygen.c:953
+#: g10/keygen.c:786
 #, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (asinar e cifrar)\n"
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "¿A súa selección? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Este algoritmo está obsoleto - ¿crear de tódolos xeitos? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Selección non válida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1525,19 +1451,19 @@ msgstr ""
 "        tamaño de chave por defecto: 1024 bits\n"
 " tamaño de chave máximo recomendado: 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA só admite tamaños entre 512 e 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:852
 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:1030
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "chave pequena de máis; 768 é o menor valor admitido\n"
 
@@ -1549,12 +1475,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:1041
+#: g10/keygen.c:866
 #, 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:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1562,29 +1488,25 @@ msgstr ""
 "¡As chaves maiores de 2048 bits non se aconsellan porque\n"
 "os cálculos levan MOITO tempo!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Está seguro de que quere este tamaño de chave? "
 
-#: 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: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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamaño de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1600,8 +1522,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1126
-#, fuzzy
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1610,38 +1531,37 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Por favor, indique canto tempo debería ser válida a chave.\n"
-"         0 = a chave non caduca\n"
-"      <n>  = a chave caduca en n días\n"
-"      <n>w = a chave caduca en n semanas\n"
-"      <n>m = a chave caduca en n meses\n"
-"      <n>y = a chave caduca en n anos\n"
+"Por favor, indique canto tempo debería ser válida a sinatura.\n"
+"         0 = a sinatura non caduca\n"
+"      <n>  = a sinatura caduca en n días\n"
+"      <n>w = a sinatura caduca en n semanas\n"
+"      <n>m = a sinatura caduca en n meses\n"
+"      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "¿Por canto tempo é válida a chave? (0) "
 
-#: g10/keygen.c:1150
-#, fuzzy
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
-msgstr "¿Por canto tempo é válida a chave? (0) "
+msgstr "¿Por canto tempo é válida a sinatura? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valor non válido\n"
 
-#: g10/keygen.c:1160
-#, fuzzy, c-format
+#: g10/keygen.c:985
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "A chave non caduca nunca\n"
+msgstr "%s non caduca nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:1167
-#, fuzzy, c-format
+#: g10/keygen.c:992
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "A chave caduca o %s\n"
+msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1649,64 +1569,62 @@ 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:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "¿Isto é correcto? (s/n) "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\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) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caracter non válido no nome\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun díxito\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Carácter non válido no comentario\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1717,28 +1635,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 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:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 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:1327
+#: g10/keygen.c:1152
 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:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1746,17 +1663,16 @@ msgstr ""
 "Necesita un contrasinal para protexe-la súa chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
-#, fuzzy
+#: g10/keyedit.c:701 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
-msgstr "o contrasinal non se repetiu correctamente; ténteo de novo.\n"
+msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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"
@@ -1768,7 +1684,7 @@ msgstr ""
 "momento, empregando este programa coa opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1246
 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"
@@ -1780,54 +1696,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:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeración de chaves.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave pública en `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2205
-#, fuzzy, c-format
+#: g10/keygen.c:1952
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "chave %08lX: chave pública non atopada: %s\n"
+msgstr "non se atopou un chaveiro público no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2211
-#, fuzzy, c-format
+#: g10/keygen.c:1958
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "chave %08lX: chave secreta non atopada: %s\n"
+msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2225
-#, fuzzy, c-format
+#: g10/keygen.c:1972
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
+msgstr "erro escribindo no chaveiro público `%s': %s\n"
 
-#: g10/keygen.c:2232
-#, fuzzy, c-format
+#: g10/keygen.c:1979
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
+msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:1999
 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:2253
-#, fuzzy
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
-msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
+msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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"
@@ -1836,115 +1751,97 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 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:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "¿Crear realmente? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "--output non traballa con este comando\n"
 
-#: g10/encode.c:126 g10/encode.c:351
-#, fuzzy, c-format
+#: g10/encode.c:92 g10/encode.c:296
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "%lu chaves procesadas\n"
+msgstr "`%s' xa está comprimido\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
-#: g10/tdbio.c:552
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro baleiro\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr ""
+msgstr "só pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:402
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr ""
+#: 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:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 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:646
+#: g10/encode.c:563
 #, 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/keyedit.c:2211
-#, fuzzy, c-format
+#: g10/delkey.c:69 g10/export.c:141
+#, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "non se atopou o usuario '%s': %s\n"
+msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
-#, fuzzy, c-format
+#: g10/delkey.c:77 g10/export.c:161
+#, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "erro lendo `%s': %s\n"
+msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: non é unha chave rfc2440 - omitida\n"
 
-#: g10/export.c:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: non está protexida - omitida\n"
 
-#: g10/export.c:196
-#, fuzzy, c-format
+#: g10/export.c:188
+#, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "chave %08lX: nova chave - omitida\n"
+msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
@@ -1954,21 +1851,21 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
+msgstr "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2100
+#: g10/getkey.c:1989
 #, 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:2147
+#: g10/getkey.c:2036
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave pública - ignorada\n"
@@ -2048,190 +1945,185 @@ msgstr "chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:544
-#, fuzzy, c-format
+#: g10/import.c:455
+#, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "chave %08lX: aceptouse o ID de usuario sin sinatura propia '"
+msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario válidos\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 msgid "this may be caused by a missing self-signature\n"
-msgstr "isto pode ser causado por unha sinatura propia que falta\n"
+msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave pública non atopada: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:578
-#, fuzzy, c-format
+#: g10/import.c:489
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
+msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave pública importada\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, 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:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, 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:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %08lX: 1 novo ID de usuario\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usuario\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova sinatura\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas sinaturas\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova sub-chave\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas sub-chaves\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: sin cambios\n"
 
-#: g10/import.c:770
-#, fuzzy, c-format
+#: g10/import.c:671
+#, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "non hai un chaveiro público por defecto\n"
+msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, 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:785
+#: g10/import.c:686
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:790
+#: g10/import.c:691
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:819
+#: g10/import.c:720
 #, 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:859
+#: g10/import.c:760
 #, 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:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revocación importado\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, 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:941
-#, fuzzy, c-format
+#: g10/import.c:839
+#, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
+msgstr "chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s\"\n"
 
-#: g10/import.c:943
-#, fuzzy, c-format
+#: g10/import.c:841
+#, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "chave %08lX: sinatura propia incorrecta\n"
+msgstr "chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:960
+#: g10/import.c:858
 #, 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:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: pasado por alto o ID de usuario '"
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: pasada por alto a sub-chave\n"
@@ -2240,204 +2132,187 @@ 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:1047
+#: g10/import.c:945
 #, 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:1056
+#: g10/import.c:954
 #, 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:1073
+#: g10/import.c:971
 #, 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:1174
+#: g10/import.c:1072
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mezclado\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1131
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr ""
+msgstr "Aviso: a chave %08lX pode estar revocada: obtendo a chave de revocación %08lX\n"
 
-#: g10/import.c:1247
+#: g10/import.c:1145
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr ""
+msgstr "Aviso: a chave %08lX pode estar revocada: chave de revocación %08lX ausente.\n"
 
-#: g10/import.c:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revocación engadido\n"
 
-#: g10/import.c:1335
-#, fuzzy, c-format
+#: g10/import.c:1231
+#, c-format
 msgid "key %08lX: direct key signature added\n"
-msgstr "chave %08lX: %d novas sinaturas\n"
+msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[revocación]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
-msgstr "[sinatura propia]"
+msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "1 sinatura errónea\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas erróneas\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 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:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, 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:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:226
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "detectado 1 ID de usuario sin sinatura propia válida\n"
+msgstr "detectado 1 ID de usuario sin auto-sinatura válida\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "detectados %d IDs de usuario sin sinatura propia válida\n"
+msgstr "detectados %d IDs de usuario sin auto-sinatura válida\n"
 
-#: g10/keyedit.c:356
-#, fuzzy, c-format
+#: g10/keyedit.c:335
+#, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "A chave está protexida.\n"
+msgstr "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
-#, fuzzy
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "¿Está seguro de que quere este tamaño de chave? "
+msgstr "¿Está seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 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:395
-#, c-format
-msgid ""
-"The self-signature on \"%s\"\n"
-"is a PGP 2.x-style signature.\n"
-msgstr ""
-
-#: g10/keyedit.c:404
-msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr ""
+msgstr " Non se puido asinar.\n"
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:364
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
+"A súa sinatura actual en \"%s\"\n"
+"é unha sinatura local.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:368
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr ""
+msgstr "¿Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:442
-#, fuzzy, c-format
+#: g10/keyedit.c:388
+#, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "Xa foi asinado pola chave %08lX\n"
+msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:446
-#, fuzzy, c-format
+#: g10/keyedit.c:393
+#, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "Xa foi asinado pola chave %08lX\n"
+msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:474
-#, fuzzy
+#: g10/keyedit.c:420
 msgid "This key has expired!"
-msgstr "Nota: ¡Esta chave xa caducou!\n"
+msgstr "¡Esta chave caducou!"
 
-#: g10/keyedit.c:494
-#, fuzzy, c-format
+#: g10/keyedit.c:440
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Esta chave non está protexida.\n"
+msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:444
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr ""
+msgstr "¿Quere que a súa sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:531
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\n"
-msgstr ""
+#: 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:533
+#: g10/keyedit.c:479
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr ""
+msgstr "Isto podería face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr ""
+msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "   (2) Fixen algunhas comprobacións.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr ""
+msgstr "   (3) Fixen comprobacións moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2445,94 +2320,73 @@ msgstr ""
 "¿Esta seguro de que quere asinar esta chave\n"
 "coa súa chave: \""
 
-#: g10/keyedit.c:600
-#, fuzzy
-msgid ""
-"\n"
-"This will be a self-signature.\n"
-msgstr "isto pode ser causado por unha sinatura propia que falta\n"
-
-#: g10/keyedit.c:604
-#, fuzzy
-msgid ""
-"\n"
-"Warning: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"A sinatura será marcada como non exportable.\n"
-"\n"
-
-#: g10/keyedit.c:609
-#, fuzzy
-msgid ""
-"\n"
-"Warning: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"A sinatura será marcada como non exportable.\n"
-"\n"
-
-#: g10/keyedit.c:616
-#, fuzzy
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
-"A sinatura será marcada como non exportable.\n"
 "\n"
+"A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:620
-#, fuzzy
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
-"A sinatura será marcada como non exportable.\n"
 "\n"
+"A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "Esta chave non está protexida.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 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:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "A chave está protexida.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2540,7 +2394,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2548,589 +2402,553 @@ msgstr ""
 "Non desexa un contrainal - ¡o que é unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "¿Seguro que quere facer esto? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave ó seu sitio\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "gardar"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "gardar e saír"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "axuda"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "listar"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "selecciona-la chave secundaria N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "verificar"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "listar sinaturas"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
-msgstr "asinar"
+msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
-msgstr "sinatura-la chave"
+msgstr "asina-la chave"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "f"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
-msgstr "sinatura-la chave localmente"
+msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:912
-#, fuzzy
+#: g10/keyedit.c:830
 msgid "nrsign"
-msgstr "asinar"
+msgstr "nrsign"
 
-#: g10/keyedit.c:912
-#, fuzzy
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
-msgstr "sinatura-la chave localmente"
+msgstr "asina-la chave de xeito non revocable"
 
-#: g10/keyedit.c:913
-#, fuzzy
+#: g10/keyedit.c:831
 msgid "nrlsign"
-msgstr "lsign"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:913
-#, fuzzy
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
-msgstr "sinatura-la chave localmente"
+msgstr "asina-la chave localmente e de xeito non revocable"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "depurar"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
-msgstr ""
+msgstr "addphoto"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:834
 msgid "add a photo ID"
-msgstr "engadir un ID de usuario"
+msgstr "engadir unha identificación fotográfica"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
-msgstr ""
+msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "engadir unha chave secundaria"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "addkey"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "engadir unha chave secundaria"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "borrar sinaturas"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
-msgstr ""
+msgstr "primary"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle between secret and public key listing"
 msgstr "cambiar entre o listado de chaves públicas e secretas"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
-#, fuzzy
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
-msgstr "amosar preferencias"
+msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
-#, fuzzy
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
-msgstr "amosar preferencias"
+msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:931
-#, fuzzy
+#: g10/keyedit.c:848
 msgid "setpref"
-msgstr "pref"
+msgstr "setpref"
 
-#: g10/keyedit.c:931
-#, fuzzy
+#: g10/keyedit.c:848
 msgid "set preference list"
-msgstr "amosar preferencias"
+msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:932
-#, fuzzy
+#: g10/keyedit.c:849
 msgid "updpref"
-msgstr "pref"
+msgstr "updpref"
 
-#: g10/keyedit.c:932
-#, fuzzy
+#: g10/keyedit.c:849
 msgid "updated preferences"
-msgstr "amosar preferencias"
+msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
-msgstr ""
+msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
-msgstr ""
+msgstr "amosa-la identificación fotográfica"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/keyedit.c:996
-#, fuzzy, c-format
+#: g10/keyedit.c:913
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "erro lendo `%s': %s\n"
+msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "A chave secreta está disponible.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "Cómpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1130
-#, fuzzy
+#: g10/keyedit.c:1047
 msgid "Key is revoked."
-msgstr "A chave está protexida.\n"
+msgstr "A chave está revocada."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1092
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "¡Non pode borra-lo último ID de usuario!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "¿Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 msgid "Do you really want to revoke the selected keys? "
 msgstr "¿Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1183
 msgid "Do you really want to revoke this key? "
 msgstr "¿Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1344
-#, fuzzy
+#: g10/keyedit.c:1252
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
+msgstr "¿Seguro que quere actualiza-las preferencias dos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1346
-#, fuzzy
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
-msgstr "¿Realmente desexa crea-los certificados de revocación? (y/N)"
+msgstr "¿Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "¿Garda-los cambios? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
-msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
+#: g10/keyedit.c:1489
+#, c-format
+msgid "This key may be revoked by %s key %s%s\n"
+msgstr "Esta chave pode estar revocada por %s chave %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
-msgstr ""
+msgstr " (sensible)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr "Creouse %s%c %4u%c/%08lX : %s caduca: %s"
+msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! revocouse a subchave: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "rev- atopouse unha revocación falsa\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: g10/keyedit.c:1827
-msgid "There are no preferences on a PGP 2.x-style key.\n"
-msgstr ""
-
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1574
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
+"Please note that the shown key validity is not necessary 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:1923
+#: g10/keyedit.c:1660
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
-"versions\n"
-"         of PGP to reject this key.\n"
+"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:1928
-#, fuzzy
+#: 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 este tamaño de chave? "
+msgstr "¿Está seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:1934
-msgid "You may not add a photo ID to a PGP2-style key.\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"
+"         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
+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"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (y/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (y/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (y/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
-msgstr "¿Realmente quere borrar esta sinatura propia? (y/N)"
+msgstr "¿Realmente quere borrar esta auto-sinatura? (y/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "Introduza o tamaño da chave"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as seleccións das chaves secretas.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:1955
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:1997
 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:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2467
-#, fuzzy
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
-msgstr "Debe seleccionar alomenos un ID de usuario.\n"
-
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "chave %08lX: sinatura propia incorrecta\n"
+msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2284
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con índice %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3139,258 +2957,243 @@ msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyedit.c:2839
-#, fuzzy, c-format
+#: g10/keyedit.c:2452
+#, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
 "\"\n"
-"asinado coa súa chave %08lX no %s\n"
+"asinado localmente coa súa chave %08lX no %s\n"
 
-#: g10/keyedit.c:2844
-#, fuzzy, c-format
+#: g10/keyedit.c:2457
+#, c-format
 msgid "This signature expired on %s.\n"
-msgstr "Sinatura %s de: %s\n"
+msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:2848
-#, fuzzy
+#: g10/keyedit.c:2461
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "¿Realmente quere revocar esta chave? "
+msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:2852
-#, fuzzy
+#: g10/keyedit.c:2465
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "¿Crear un certificado de revocación para esta sinatura? (y/N)"
+msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "Firmou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:2891
-#, fuzzy, c-format
+#: g10/keyedit.c:2504
+#, c-format
 msgid "   signed by %08lX at %s%s%s\n"
-msgstr "asinado por %08lX no %s\n"
+msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, c-format
 msgid "   revoked by %08lX at %s\n"
-msgstr "revocada por %08lX no %s\n"
+msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:2929
-#, fuzzy, c-format
+#: g10/keyedit.c:2542
+#, c-format
 msgid "   signed by %08lX at %s%s\n"
-msgstr "asinado por %08lX no %s\n"
+msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
-msgstr ""
+msgstr " (non exportable)"
 
-#: g10/keyedit.c:2938
-#, fuzzy
+#: g10/keyedit.c:2551
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "¿Realmente desexa crea-los certificados de revocación? (y/N)"
+msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, 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 "Sinatura %s de: %s\n"
+msgstr "Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:93
-#, fuzzy
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
-msgstr "Sinatura %s de: %s\n"
+msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atopáronse datos de notación non válidos\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "Notación: "
-
-#: g10/keylist.c:129
-#, fuzzy
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
-msgstr "Notación: "
+msgstr "Notación de sinaturas: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
-msgstr ""
+msgstr "non lexible por humanos"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
-msgstr ""
+msgstr "Chaveiro"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "Fingerprint:"
 msgstr "Pegada dactilar:"
 
 #. 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
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "         Pegada dactilar:"
 
-#: g10/keylist.c:962
-#, fuzzy
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
-msgstr "         Pegada dactilar:"
+msgstr "     Pegada dactilar ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave pública: DEK correcto\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:378
 #, 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:419
+#: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave pública: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
-#, fuzzy, c-format
+#: g10/mainproc.c:429 g10/mainproc.c:448
+#, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "datos cifrados con %s\n"
+msgstr "supoñendo datos cifrados con %s\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr ""
+msgstr "A cifra IDEA non está dispoñible, téntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Normativa: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verificación de sinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas múltiples\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Sinatura feita por %.*s usando %s de ID de chave %08lX\n"
+msgstr "Asinada o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
-#, fuzzy
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
-msgstr "Sinatura correcta de \""
+msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
-msgstr ""
+msgstr "[incerto]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
-msgstr "               aka \""
+msgstr "               alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "non é unha sinatura separada\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz incorrecto detectado en proc_tree()\n"
 
@@ -3405,50 +3208,32 @@ 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:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr ""
+msgstr "Aviso: propiedade insegura en %s \"%s\"\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr ""
+msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "o plugin de cifra IDEA non está presente\n"
 
-#: 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 "AVISO: `%s' é un ficheiro baleiro\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:656
-#, fuzzy, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVISO: `%s' é un ficheiro baleiro\n"
-
-#: g10/misc.c:658
-#, c-format
-msgid "please use \"%s%s\" instead\n"
-msgstr ""
-
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
 #, 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:1057
+#: g10/parse-packet.c:1053
 #, 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"
@@ -3459,24 +3244,24 @@ msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
 #: g10/passphrase.c:450
 msgid "can't set client pid for the agent\n"
-msgstr ""
+msgstr "non se pode estabrece-lo pid do cliente para o axente\n"
 
 #: g10/passphrase.c:458
 msgid "can't get server read FD for the agent\n"
-msgstr ""
+msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n"
 
 #: g10/passphrase.c:465
 msgid "can't get server write FD for the agent\n"
-msgstr ""
+msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n"
 
 #: g10/passphrase.c:498
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
 #: g10/passphrase.c:511
-#, fuzzy, c-format
+#, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "o algoritmo de protección %d non está soportado\n"
+msgstr "a versión %d do protocolo de gpg-agent non está soportada\n"
 
 #: g10/hkp.c:147 g10/passphrase.c:532
 #, c-format
@@ -3485,12 +3270,11 @@ msgstr "non se puido conectar a `%s': %s\n"
 
 #: g10/passphrase.c:554
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "problema de comunicación con gpg-agent\n"
 
 #: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
-#, fuzzy
 msgid "problem with the agent - disabling agent use\n"
-msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
+msgstr "problema co axente - desactivando o emprego do axente\n"
 
 #: g10/passphrase.c:631 g10/passphrase.c:1017
 #, c-format
@@ -3565,9 +3349,9 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opción \"--output\" para gardalos\n"
 
 #: g10/plaintext.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "error creating `%s': %s\n"
-msgstr "erro lendo `%s': %s\n"
+msgstr "erro ao crear `%s': %s\n"
 
 #: g10/plaintext.c:337
 msgid "Detached signature.\n"
@@ -3590,44 +3374,39 @@ 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:101
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:100
+#, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "receptor anónimo; tentando a chave secreta %08lX ...\n"
+msgstr "destinatario anónimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "Ok, nós somo-lo receptor anónimo.\n"
+msgstr "vale, nós somo-lo destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 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:178
-#, fuzzy, c-format
+#: g10/pubkey-enc.c:177
+#, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "o algoritmo de cifrado %d é descoñecido ou está desactivado\n"
+msgstr "o algoritmo de cifrado %d%s é descoñecido ou está desactivado\n"
 
-#: g10/pubkey-enc.c:221
+#: g10/pubkey-enc.c:220
 #, 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:243
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
-msgid "NOTE: key has been revoked"
-msgstr "chave %08lX: ¡esta chave está revocada!\n"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %08lX from HKP keyserver %s\n"
-msgstr "solicitando a chave %08lX de %s ...\n"
+msgstr "solicitando a chave %08lX do servidor de chaves HKP %s\n"
 
 #: g10/hkp.c:94
 #, c-format
@@ -3649,54 +3428,45 @@ msgstr "éxito ao enviar a `%s' (estado=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fallo ao enviar a `%s': estado=%u\n"
 
-#: g10/hkp.c:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
+msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/hkp.c:543
-#, fuzzy, c-format
+#: g10/hkp.c:521
+#, c-format
 msgid "can't search keyserver: %s\n"
-msgstr "non se pode obte-la chave do servidor de chaves: %s\n"
+msgstr "non se pode buscar no servidor de chaves: %s\n"
 
 #: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
 #: g10/seckey-cert.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "o algoritmo de protección %d non está soportado\n"
+msgstr "o algoritmo de protección %d%s non está soportado\n"
 
 #: g10/seckey-cert.c:215
-#, fuzzy
 msgid "Invalid passphrase; please try again"
-msgstr "Contrasinal non válido; por favor, ténteo de novo ...\n"
+msgstr "Contrasinal non válido; por favor, ténteo de novo"
 
 #: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
-msgstr ""
+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 ""
+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"
+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
 #, c-format
@@ -3715,61 +3485,49 @@ msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
 #: g10/sig-check.c:318
 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"
-
-#: g10/sign.c:103
-#, c-format
-msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr ""
+msgstr "asumindo unha sinatura incorrecta debido a un bit crítico descoñecido\n"
 
-#: g10/sign.c:151
+#: g10/sign.c:115
 #, c-format
-msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr ""
+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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é un ficheiro baleiro\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:618
+msgid "you can only 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:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: 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
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr ""
+msgstr "só pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1029
-#, fuzzy, c-format
+#: g10/sign.c:953
+#, c-format
 msgid "%s encryption will be used\n"
-msgstr "o descifrado fallou: %s\n"
+msgstr "hase empregar cifrado %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3789,8 +3547,7 @@ 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"
@@ -3812,9 +3569,9 @@ msgid "%s: can't create lock\n"
 msgstr "%s: non se pode crea-lo bloqueo\n"
 
 #: g10/tdbio.c:480 g10/tdbio.c:544
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't make lock\n"
-msgstr "%s: non se pode crea-lo bloqueo\n"
+msgstr "%s: non se pode bloquear\n"
 
 #: g10/keyring.c:1436 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:484
 #, c-format
@@ -3851,8 +3608,7 @@ 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"
@@ -3909,30 +3665,27 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "'%s' non é un ID longo de chave válido\n"
+msgstr "`%s' non é un ID longo de chave válido\n"
 
 #: g10/trustdb.c:235
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: accepted as trusted key\n"
-msgstr "chave %08lX: aceptada como chave de confianza.\n"
+msgstr "chave %08lX: aceptada como chave de confianza\n"
 
 #: g10/trustdb.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "chave %08lX: non se pode pór na base de datos de confianza\n"
+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
@@ -3940,9 +3693,9 @@ msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petición %d: fallou a lectura: %s\n"
 
 #: g10/trustdb.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "rexistro de confianza %lu: fallou o borrado: %s\n"
+msgstr "o rexistro de confianza %lu non é do tipo %d solicitado\n"
 
 #: g10/trustdb.c:353
 #, c-format
@@ -3955,34 +3708,32 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronización: %s\n"
 
 #: g10/trustdb.c:468
-#, fuzzy
 msgid "no need for a trustdb check\n"
-msgstr "%s: non é un ficheiro de base de datos de confianza\n"
+msgstr "non se precisa comproba-la base de datos de confianza\n"
 
 #: g10/trustdb.c:474 g10/trustdb.c:1641
-#, fuzzy, c-format
+#, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
+msgstr "hase comproba-la base de datos de confianza o %s\n"
 
 #: g10/trustdb.c:779
-#, fuzzy
 msgid "checking the trustdb\n"
-msgstr "cambia-la confianza sobre o dono"
+msgstr "comprobando a base de datos de confianza\n"
 
 #: g10/trustdb.c:933
-#, fuzzy, c-format
+#, c-format
 msgid "public key %08lX not found: %s\n"
-msgstr "non se atopou a chave pública"
+msgstr "non se atopou a chave pública %08lX: %s\n"
 
 #: g10/trustdb.c:1515
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr ""
+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 ""
+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 ""
@@ -3997,37 +3748,30 @@ 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:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 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:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "omítese `%s': duplicada\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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
@@ -4074,12 +3818,10 @@ 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
@@ -4093,18 +3835,15 @@ 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 ""
+msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
 #: g10/delkey.c:116
 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
 msgid "Delete this key from the keyring? "
@@ -4115,23 +3854,22 @@ msgid "This is a secret key! - really delete? "
 msgstr "¡Esta é unha chave secreta! - ¿está seguro de que quere borrala? "
 
 #: g10/delkey.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "erro ó enumera-los bloques de chaves: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
 
 #: g10/delkey.c:166
 msgid "ownertrust information cleared\n"
-msgstr ""
+msgstr "borrouse a información de confianza\n"
 
 #: g10/delkey.c:194
-#, fuzzy, c-format
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "¡hai unha chave secreta para esta chave pública!\n"
+msgstr "¡hai unha chave secreta para a chave pública \"%s\"!\n"
 
 #: g10/delkey.c:196
-#, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "empregue a opción \"--delete-secret-key\" para borrala primeiro.\n"
+msgstr "empregue a opción \"--delete-secret-keys\" para borrala primeiro.\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -4150,6 +3888,9 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
+"Para construí-la Rede-de-Confianza, GnuPG precisa saber que chaves teñen\n"
+"confianza absoluta - esas adoitan se-las chaves das que ten acceso á chave\n"
+"secreta. Responda \"si\" para lle dar confianza total a esta chave\n"
 
 #: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
@@ -4160,8 +3901,7 @@ 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
@@ -4173,8 +3913,7 @@ 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"
@@ -4211,23 +3950,15 @@ 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: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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "Introduza o tamaño da chave"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4239,19 +3970,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:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 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:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4265,56 +3996,74 @@ msgstr ""
 "O  para continuar coa xeración da chave.\n"
 "S  para saír da xeración da chave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 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:162
+#: g10/helptext.c:156
 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 ""
+"Cando asina un ID de usuario dunha chave, debería comprobar antes\n"
+"que a chave pertence á persoa que aparece no identificador. É útil para os\n"
+"demais saber con canto tino comprobou isto.\n"
+"\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"
+"    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"
+"\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"
+"    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"
+"    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"
+"\n"
+"Teña en conta que os exemplos de enriba para os niveis 2 e 3 son *só*\n"
+"exemplos. Á final, depende de vostede decidir que significan \"informal\" e\n"
+"\"extensivo\" ao asinar outras chaves.\n"
+"\n"
+"Se non sabe cal é a resposta correcta, resposte \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:194
 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:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4322,11 +4071,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "¡Tamén se han perder tódolos certificados!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:203
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se é correcto borrar esta subchave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:208
 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"
@@ -4336,7 +4085,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:219
+#: g10/helptext.c:213
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4348,13 +4097,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:225
+#: g10/helptext.c:219
 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:229
+#: g10/helptext.c:223
 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"
@@ -4368,34 +4117,33 @@ msgstr ""
 "só se esta auto-sinatura non é correcta por algun motivo e hai\n"
 "unha segunda á súa disposición."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:231
 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-las preferencias de tódolos IDs de usuario (ou só dos seleccionados)\n"
+"á lista actual de preferencias. A marca de tempo de tódalas auto-sinaturas\n"
+"afectadas ha avanzar un segundo.\n"
 
-#: g10/helptext.c:244
-#, fuzzy
+#: g10/helptext.c:238
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-"Por favor, introduza o contrasinal; esta é unha frase secreta \n"
-"  Blurb, blurb ..."
+msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:244
 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:254
+#: g10/helptext.c:248
 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:259
+#: g10/helptext.c:253
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se é correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4403,7 +4151,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:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4431,7 +4179,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:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4441,34 +4189,34 @@ 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:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "Non hai axuda dispoñible"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispoñible para `%s'"
 
 #: g10/keydb.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
 #: g10/keydb.c:188
 #, c-format
 msgid "changing permission of  `%s' failed: %s\n"
-msgstr ""
+msgstr "o cambio de permisos de `%s' fallou: %s\n"
 
 #: g10/keydb.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "keyring `%s' created\n"
-msgstr "%s: chaveiro creado\n"
+msgstr "chaveiro `%s' creado\n"
 
 #: g10/keydb.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: fallo ao crear unha táboa hash: %s\n"
+msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
 
 #: g10/keyring.c:1235
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4489,51 +4237,25 @@ msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, amañe este posible fallo de seguridade\n"
 
 #: g10/keyring.c:1337
-#, fuzzy, c-format
+#, c-format
 msgid "checking keyring `%s'\n"
-msgstr "non foi posible bloquea-lo chaveiro `%s': %s\n"
+msgstr "comprobando o chaveiro `%s'\n"
 
 #: g10/keyring.c:1368
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu chaves procesadas hasta polo momento\n"
+msgstr "%lu chaves comprobadas ata o momento (%lu sinaturas)\n"
 
 #: g10/keyring.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys checked (%lu signatures)\n"
-msgstr "ve-la lista de chaves e sinaturas"
+msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
 #: g10/keyring.c:1441
 #, c-format
 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"
-
-#, fuzzy
-#~ msgid "Are you sure you still want to sign it?\n"
-#~ msgstr "¿Está seguro de que quere este tamaño de chave? "
-
-#, fuzzy
-#~ msgid "  Are you sure you still want to sign it?\n"
-#~ msgstr "¿Está seguro de que quere este tamaño de chave? "
-
-#, fuzzy
-#~ msgid "Really sign? (y/N) "
-#~ msgstr "¿Asinar de verdade? "
-
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "pedíronse demasiados bits aleatorios; o límite é %d\n"
 
@@ -4560,8 +4282,7 @@ 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 ""
@@ -4586,8 +4307,7 @@ 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: "
@@ -4598,6 +4318,9 @@ 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? "
 
@@ -4614,11 +4337,10 @@ 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 sinatura propia\n"
+#~ msgstr "chave %08lX: a nosa copia non ten auto-sinatura\n"
 
 #~ msgid "%s: user not found\n"
 #~ msgstr "%s: usuario non atopado\n"
@@ -4629,8 +4351,7 @@ 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"
@@ -4642,8 +4363,7 @@ 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"
@@ -4691,9 +4411,7 @@ 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"
@@ -4772,8 +4490,7 @@ 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"
@@ -4791,8 +4508,7 @@ 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"
@@ -4830,10 +4546,7 @@ 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 1e155b785..80cb0a14a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,12 +1,12 @@
-# Gnu Privacy Guard 1.0.7 (Indonesian)
-# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
-# Tedi Heriyanto <tedi_h@gmx.net>, 2002.
+# gnupg 1.0.7 (Indonesian)
+# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Tedi Heriyanto <tedi_h@gmx.net>, 1999, 2000, 2001, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNUPG 1.0.7\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-04-20 21:26GMT+0700\n"
+"Project-Id-Version: gnupg 1.0.7\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-07-24 21:11GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,7 @@ 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"
@@ -47,7 +46,7 @@ msgstr "tidak"
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "keluar"
 
@@ -274,7 +273,7 @@ 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:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -339,7 +338,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +349,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:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +357,163 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
 msgstr "|[files]|enkripsi file"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
 msgstr "|[files]|dekripsi file"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:320
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:322
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:325
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
 msgstr "tandai kunci tidak dapat di-revoke"
 
-#: g10/g10.c:326
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:334
+#: g10/g10.c:320
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:336
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:350
+#: g10/g10.c:336
 msgid "unattended trust database update"
 msgstr "perbarui database trust secara otomatis"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,192 +523,196 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:376
+#: g10/g10.c:362
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:390
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
 msgstr "jangan paksa signature v3"
 
-#: g10/g10.c:391
+#: g10/g10.c:377
 msgid "force v4 key signatures"
 msgstr "paksa signature kunci v4"
 
-#: g10/g10.c:392
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
 msgstr "jangan paksa signature kunci v4"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:395
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
 msgstr "jangan gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "gunakan gpg-agent"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:418
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
 msgstr "|[file]|tulis status info ke file"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percayai kunci ini"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
 
-#: g10/g10.c:434
+#: g10/g10.c:414
 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:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:444
+#: g10/g10.c:422
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
 msgstr "Tampilkan Photo IDs"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
 msgstr "Jangan tampilkan Photo IDs"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
 msgstr "Set perintah baris untuk melihat Photo IDs"
 
-#: g10/g10.c:459
+#: g10/g10.c:431
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|NAME=VALUE|gunakan notasi data ini"
+
+#: g10/g10.c:434
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -717,7 +720,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -737,15 +740,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Silakan laporkan kesalahan ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -755,7 +758,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -763,280 +766,257 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1228
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr "tidak dapat menset exec-path ke %s\n"
+msgstr ""
+
+#: g10/g10.c:1251 g10/g10.c:1267
+#, fuzzy, c-format
+msgid "WARNING: %s is a deprecated option.\n"
+msgstr "PERINGATAN: `%s' adalah file kosong\n"
+
+#: g10/g10.c:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr ""
 
-#: g10/g10.c:1476
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 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:1525
+#: g10/g10.c:1395
 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:1531
+#: g10/g10.c:1401
 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:1544
+#: g10/g10.c:1414
 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:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620
+#: g10/sign.c:798
 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:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: g10/g10.c:1499
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 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:1637
+#: g10/g10.c:1508
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1512
 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:1645
+#: g10/g10.c:1516
 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:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "preferensi tidak valid\n"
-
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "preferensi tidak valid\n"
-
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "preferensi tidak valid\n"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
 msgstr "preferensi tidak valid\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2101
 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:2260 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 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:2474
-#, 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: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:2483
-msgid "a notation value must not use any control characters\n"
-msgstr "nilai notasi tidak boleh menggunakan karakter kendali\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:2520
-msgid "the given certification policy URL is invalid\n"
-msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\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:2522
-msgid "the given signature policy URL is invalid\n"
-msgstr "URL signature kebijakan yang diberikan tidak valid\n"
+#: g10/g10.c:2333
+msgid "a notation value must not use any control characters\n"
+msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
 #: g10/armor.c:314
 #, c-format
@@ -1107,11 +1087,8 @@ 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"
@@ -1134,13 +1111,11 @@ msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "Alasan pembatalan:"
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "Komentar pembatalan:"
 
 #. a string with valid answers
@@ -1243,10 +1218,8 @@ 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
@@ -1308,12 +1281,10 @@ 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
@@ -1325,30 +1296,28 @@ 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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:803
+#: g10/pkclist.c:752
 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:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1356,130 +1325,121 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:862
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "preferensi %c%lu tidak valid\n"
 
-#: g10/keygen.c:189
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:194
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "Karakter tidak valid dalam string preferensi\n"
-
-#: g10/keygen.c:524
+#: g10/keygen.c:257
 #, fuzzy
-msgid "writing direct signature\n"
-msgstr "menulis self signature\n"
+msgid "invalid character in preference string\n"
+msgstr "Karakter tidak valid dalam string\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
-
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1492,20 +1452,19 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:852
 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:1030
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
@@ -1517,12 +1476,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:1041
+#: g10/keygen.c:866
 #, 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:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1530,29 +1489,25 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: 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: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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1568,7 +1523,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1584,30 +1539,30 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:985
 #, 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:1167
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1615,63 +1570,61 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\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) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1681,27 +1634,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 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:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 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:1327
+#: g10/keygen.c:1152
 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:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1709,16 +1662,16 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:701 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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"
@@ -1726,12 +1679,11 @@ 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:1421
+#: g10/keygen.c:1246
 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"
@@ -1743,171 +1695,152 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2253
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 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:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:92 g10/encode.c:296
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 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:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:402
-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:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 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: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:646
+#: g10/encode.c:563
 #, 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/keyedit.c:2211
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:196
+#: g10/export.c:188
 #, 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:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1917,21 +1850,21 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1438
-#, c-format
+#: g10/getkey.c:1360
+#, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
+msgstr "kunci tidak valid %08lX dibuat valid oleh --always-trust\n"
 
-#: g10/getkey.c:2100
+#: g10/getkey.c:1989
 #, 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:2147
+#: g10/getkey.c:2036
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -2011,184 +1944,177 @@ msgstr "  kunci rahasia diimpor: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "kunci %08lX: subkey binding tidak valid\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:544
-#, c-format
+#: g10/import.c:455
+#, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
+msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:578
+#: g10/import.c:489
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, 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:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, 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:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:770
+#: g10/import.c:671
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, 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:785
+#: g10/import.c:686
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:790
+#: g10/import.c:691
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:819
+#: g10/import.c:720
 #, 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:859
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:941
-#, c-format
+#: g10/import.c:839
+#, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
+msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:943
-#, c-format
+#: g10/import.c:841
+#, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
+msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:960
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -2197,211 +2123,194 @@ 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:1047
+#: g10/import.c:945
 #, 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:1056
+#: g10/import.c:954
 #, 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:1073
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1072
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1131
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
-"Peringatan: kunci %08lX mungkin dibatalkan: ambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1247
+#: g10/import.c:1145
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
-"Peringatan: kunci %08lX mungkin dibatalkan: kunci pembatalan %08lX tidak "
-"ada.\n"
 
-#: g10/import.c:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1231
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, 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:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:226
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:228
 #, 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:356
-#, c-format
+#: g10/keyedit.c:335
+#, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "ID User \"%s\" dibatalkan."
+msgstr "ID User \"%s\" dibatalkan.\n"
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Anda tetap ingin menandatanganinya? (y/n) "
+msgstr "Apakah anda yakin masih ingin menandainya?\n"
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 msgid "  Unable to sign.\n"
-msgstr "  Tidak dapat menandatangani.\n"
-
-#: g10/keyedit.c:376
-#, c-format
-msgid "Warning: user ID \"%s\" is not self-signed.\n"
-msgstr ""
-
-#: g10/keyedit.c:395
-#, 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"
-
-#: g10/keyedit.c:404
-#, fuzzy
-msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
-#, c-format
+#: g10/keyedit.c:364
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local 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:422
+#: g10/keyedit.c:368
+#, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/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:442
-#, c-format
+#: g10/keyedit.c:388
+#, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "\"%s\" sudah ditandai secara lokal dengan kunci %08lX\n"
+msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
 
-#: g10/keyedit.c:446
-#, c-format
+#: g10/keyedit.c:393
+#, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "\"%s\" sudah ditandai dengan kunci %08lX\n"
+msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:420
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:440
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:444
+#, 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) "
+msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:531
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\n"
-msgstr ""
-"Anda tidak boleh membuat tanda tangan OpenPGP pada kunci bergaya PGP 2.x "
-"saat dalam mode --pgp2\n"
+#: g10/keyedit.c:477
+#, 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"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:479
+#, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "Hal ini akan membuat kunci tidak bermanfaat dalam PGP 2.x\n"
+msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, 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:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2409,32 +2318,7 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:600
-#, fuzzy
-msgid ""
-"\n"
-"This will be a self-signature.\n"
-msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
-
-#: g10/keyedit.c:604
-#, 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:609
-#, 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:616
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2442,7 +2326,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2450,7 +2334,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2458,7 +2342,7 @@ msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2466,7 +2350,7 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2474,33 +2358,33 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2508,7 +2392,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2516,579 +2400,553 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "hapus ID user"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "addkey"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "tambah kunci sekunder"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
 msgstr "primer"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:913
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1047
+#, fuzzy
 msgid "Key is revoked."
-msgstr "Kunci dibatalkan."
+msgstr "Kunci dibatalkan.\n"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1092
 #, 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:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1183
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1252
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:1489
+#, c-format
+msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Kunci ini mungkin dibatalkan oleh %s kunci %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, 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:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1827
-msgid "There are no preferences on a PGP 2.x-style key.\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 ""
 
-#: g10/keyedit.c:1835
-#, fuzzy
+#: g10/keyedit.c:1660
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
-"unless you restart the program.\n"
+"WARNING: This key already has a photo ID.\n"
+"         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
-"Perhatikan bahwa validitas kunci yang ditunjukkan tidak perlu benar\n"
-"kecuali anda memulai kembali program.\n"
+"PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
+"         Menambahkan photo ID lain dapat membingungkan beberapa versi PGP.\n"
+
+#: g10/keyedit.c:1664 g10/keyedit.c:1691
+#, 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:1923
+#: 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 ""
-"PERINGATAN: Ini adalah kunci bergaya PGP2.  Menambahkan sebuah photo ID "
-"dapat menyebabkan beberapa versi\n"
+"PERINGATAN: Ini adalah kunci bergaya PGP2.  Menambahkan sebuah photo ID dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:1928
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Anda tetap ingin menambahkannya? (y/N) "
-
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1697
 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:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "Masukkan ukuran kunci"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:1955
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:1997
 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:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
-
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2284
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3097,251 +2955,246 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2839
-#, c-format
+#: g10/keyedit.c:2452
+#, fuzzy, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
 "\"\n"
-"ditandai secara lokal dengan kunci anda %08lX pada %s\n"
+"ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2844
-#, c-format
+#: g10/keyedit.c:2457
+#, fuzzy, c-format
 msgid "This signature expired on %s.\n"
-msgstr "Kunci ini kadaluarsa pada %s \n"
+msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2461
+#, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Anda tetap ingin membatalkannya? (y/N) "
+msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2465
+#, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Buat sertifikat pembatalan untuk signature ini? (y/N) "
+msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:2891
-#, c-format
+#: g10/keyedit.c:2504
+#, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
-msgstr "   ditandai oleh %08lX pada %s%s%s\n"
+msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2542
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
-msgstr " (non-exportable)"
+msgstr ""
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2551
+#, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Ingin membuat sertifikat pembatalan? (y/N)"
+msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Menampilkan ID foto %s ukuran %ld untuk kunci 0x%08lX (uid %d)\n"
-
-#: g10/keylist.c:91
-#, fuzzy
-msgid "Critical signature policy: "
-msgstr "Kebijakan signature: "
+msgstr ""
 
-#: g10/keylist.c:93
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "Notasi signature: "
-
-#: g10/keylist.c:129
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
 msgstr "Keyring"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "Fingerprint:"
 msgstr "Fingerprint:"
 
 #. 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
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:378
 #, 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:419
+#: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:429 g10/mainproc.c:448
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, 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:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, 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:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -3356,51 +3209,32 @@ 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:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\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 option terdepresiasi\n"
-
-#: g10/misc.c:656
-#, fuzzy, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "PERINGATAN: `%s' adalah option terdepresiasi\n"
-
-#: g10/misc.c:658
-#, fuzzy, c-format
-msgid "please use \"%s%s\" instead\n"
-msgstr "silakan gunakan \"--keyserver-options %s\"\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/parse-packet.c:120
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1057
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -3541,39 +3375,34 @@ 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:101
+#: g10/pubkey-enc.c:100
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:177
 #, 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:221
+#: g10/pubkey-enc.c:220
 #, 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:243
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
-msgid "NOTE: key has been revoked"
-msgstr "kunci %08lX: kunci telah dibatalkan!\n"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3600,16 +3429,12 @@ msgstr "success sending to `%s' (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "failed sending to `%s': status=%u\n"
 
-#: g10/hkp.c:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:521
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "tidak dapat mencari keyserver: %s\n"
@@ -3638,13 +3463,11 @@ msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
 #: g10/seckey-cert.c:311
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "membuat checksum 16-bit untuk perlindungan kunci pribadi\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"
+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
 #, c-format
@@ -3665,63 +3488,44 @@ msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 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: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
+#: g10/sign.c:115
 #, 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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\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: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:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: 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
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 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:1029
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -3948,34 +3752,28 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 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:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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
@@ -4022,14 +3820,11 @@ 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"
@@ -4042,12 +3837,11 @@ 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 "DSA membutuhkan penggunaan algoritma hash 160-bit\n"
+msgstr ""
 
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
@@ -4068,7 +3862,7 @@ msgstr "gagal menghapus keyblok: %s\n"
 
 #: g10/delkey.c:166
 msgid "ownertrust information cleared\n"
-msgstr "informasi ownertrust dihapus\n"
+msgstr ""
 
 #: g10/delkey.c:194
 #, c-format
@@ -4085,10 +3879,8 @@ 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
@@ -4112,8 +3904,7 @@ 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
@@ -4125,8 +3916,7 @@ 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"
@@ -4163,23 +3953,16 @@ msgstr ""
 "karena belum didukung oleh seluruh program dan signature yang dibuat\n"
 "oleh mereka cukup besar dan sangat lambat untuk diverifikasi."
 
-#: 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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4191,19 +3974,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4217,93 +4000,72 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 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:162
+#: g10/helptext.c:156
 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:200
+#: g10/helptext.c:194
 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:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4311,11 +4073,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:203
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:208
 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"
@@ -4325,7 +4087,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:213
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4337,7 +4099,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:219
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4345,7 +4107,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:223
 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"
@@ -4359,7 +4121,8 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:231
+#, fuzzy
 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"
@@ -4369,24 +4132,23 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:238
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:244
 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:254
+#: g10/helptext.c:248
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:253
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4394,7 +4156,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:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4412,8 +4174,7 @@ 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"
@@ -4421,10 +4182,9 @@ 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:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4434,11 +4194,11 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -4501,23 +4261,14 @@ 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 "Do you really need such a large keysize? "
+#~ msgstr "Apakah anda perlu keysize sebesar itu? "
 
-#~ 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 "key %08lX: our copy has no self-signature\n"
+#~ msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\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 "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Apakah anda yakin masih ingin menandainya?\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 "   signed by %08lX at %s\n"
+#~ msgstr "   ditandai oleh %08lX pada %s\n"
diff --git a/po/it.po b/po/it.po
index ed42091af..f42f5b2c8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,10 +5,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-04-21 21:54+0200\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-05-09 21:57+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
-"Language-Team: Italian <it@li.org>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
@@ -273,7 +273,7 @@ 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:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -294,8 +294,7 @@ 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"
+msgstr "attenzione: le dimensioni del file random_seed non sono valide - non usato\n"
 
 #: cipher/random.c:348
 #, c-format
@@ -323,8 +322,7 @@ msgstr "impossibile chiudere `%s': %s\n"
 
 #: cipher/random.c:662
 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
 msgid ""
@@ -340,7 +338,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +350,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +358,163 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
 msgstr "|[file]|cifra i file"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
 msgstr "|[file]|decifra i file"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:320
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/g10.c:322
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/g10.c:325
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
 msgstr "firma una chiave irrevocabilmente"
 
-#: g10/g10.c:326
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
 msgstr "firma una chiave localmente e irrevocabilmente"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:334
+#: g10/g10.c:320
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/g10.c:336
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:350
+#: g10/g10.c:336
 msgid "unattended trust database update"
-msgstr "aggiornamento non presidiato del database delle fiducia"
+msgstr "aggiornamento non presidiato del database della fiducia"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,194 +524,198 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:376
+#: g10/g10.c:362
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:390
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
 msgstr "non forza l'uso di firme v3"
 
-#: g10/g10.c:391
+#: g10/g10.c:377
 msgid "force v4 key signatures"
 msgstr "forza l'uso di firme v4"
 
-#: g10/g10.c:392
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
 msgstr "non forza l'uso di firme v4"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:395
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
 msgstr "non usa mai un MDC per cifrare"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "usa gpg-agent"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr "assumi \"sì\" per quasi tutte le domande"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/g10.c:418
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
 msgstr "|[file]|scrivi le informazioni di stato nel file"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 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:434
+#: g10/g10.c:414
 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:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:444
+#: g10/g10.c:422
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
 msgstr "Mostra le fotografie"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
 msgstr "Non mostra le fotografie"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
 msgstr "Imposta la riga di comando per vedere le fotografie"
 
-#: g10/g10.c:459
+#: g10/g10.c:431
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|NOME=VALORE|usa questi dati per una nota"
+
+#: g10/g10.c:434
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -721,7 +723,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -741,15 +743,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +761,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,277 +769,260 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non è un set di caratteri valido\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:1340
+#: 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:1476
+#: 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:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr "usa al suo posto \"--keyserver-options %s\"\n"
+
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 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:1525
+#: g10/g10.c:1395
 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:1531
+#: g10/g10.c:1401
 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:1544
+#: g10/g10.c:1414
 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:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
 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:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: g10/g10.c:1499
 #, 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:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 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:1637
+#: g10/g10.c:1508
 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:1641
+#: g10/g10.c:1512
 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:1645
+#: g10/g10.c:1516
 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:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "preferenze non valide\n"
-
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "preferenze non valide\n"
-
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "preferenze non valide\n"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
 msgstr "preferenze non valide\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2101
 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:2260 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:2474
-#, fuzzy
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\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"
 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:2483
+#: 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
 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:2520
-msgid "the given certification policy URL is invalid\n"
-msgstr "l'URL della politica di certificazione indicato non è valido\n"
-
-#: g10/g10.c:2522
-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"
@@ -1107,8 +1092,7 @@ 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"
@@ -1134,13 +1118,11 @@ msgid "User ID is no longer valid"
 msgstr "L'user ID non è più valido"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "Ragione della revoca: "
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "Commento alla revoca: "
 
 #. a string with valid answers
@@ -1243,10 +1225,8 @@ 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
@@ -1311,10 +1291,8 @@ 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"
@@ -1325,30 +1303,28 @@ 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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica già presente\n"
 
-#: g10/pkclist.c:803
+#: g10/pkclist.c:752
 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:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1356,130 +1332,120 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica già impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica è disabilitata.\n"
 
-#: g10/pkclist.c:862
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
 msgstr "saltato: chiave pubblica già impostata\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "la preferenza %c%lu non è valida\n"
 
-#: g10/keygen.c:189
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "la preferenza %c%lu è doppia\n"
 
-#: g10/keygen.c:194
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:257
 msgid "invalid character in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:524
-#, fuzzy
-msgid "writing direct signature\n"
-msgstr "scrittura della autofirma\n"
-
-#: g10/keygen.c:563
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:953
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (firma e cifra)\n"
-
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "L'uso di questo algoritmo è deprecato - la creo comunque? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1492,19 +1458,19 @@ msgstr ""
 "          la dimensione predefinita è 1024 bit\n"
 "  la dimensione massima consigliata è 2048 bit\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 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:1027
+#: g10/keygen.c:852
 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:1030
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 
@@ -1516,12 +1482,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:1041
+#: g10/keygen.c:866
 #, 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:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1529,29 +1495,25 @@ msgstr ""
 "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: 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: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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1567,7 +1529,7 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1583,30 +1545,30 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:985
 #, 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:1167
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s scadrà il %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1614,64 +1576,61 @@ msgstr ""
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "È giusto (s/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\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) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1682,27 +1641,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 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:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 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:1327
+#: g10/keygen.c:1152
 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:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1710,16 +1669,16 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:701 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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"
@@ -1731,7 +1690,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1246
 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"
@@ -1743,175 +1702,157 @@ 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:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avrà 1024 bit.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2253
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 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:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:92 g10/encode.c:296
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' è già compresso\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
-#: g10/tdbio.c:552
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 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:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:402
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:347
+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:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 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:646
+#: g10/encode.c:563
 #, 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/keyedit.c:2211
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:196
+#: g10/export.c:188
 #, 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:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non è stato esportato nulla\n"
 
@@ -1921,21 +1862,21 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1360
 #, 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:2100
+#: g10/getkey.c:1989
 #, 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:2147
+#: g10/getkey.c:2036
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -2015,185 +1956,179 @@ msgstr "chiavi segrete importate: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "chiave %08lX: legame con la subchiave non valido:\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:544
+#: g10/import.c:455
 #, 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:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo può essere causato da una autofirma mancante\n"
 
-#: g10/import.c:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:578
+#: g10/import.c:489
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, 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:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, 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:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:770
+#: g10/import.c:671
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, 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:785
+#: g10/import.c:686
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: già nel portachiavi segreto\n"
 
-#: g10/import.c:790
+#: g10/import.c:691
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:819
+#: g10/import.c:720
 #, 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:859
+#: g10/import.c:760
 #, 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:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:941
+#: g10/import.c:839
 #, 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:943
+#: g10/import.c:841
 #, 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:960
+#: g10/import.c:858
 #, 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:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -2202,129 +2137,110 @@ 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:1047
+#: g10/import.c:945
 #, 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:1056
+#: g10/import.c:954
 #, 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:1073
+#: g10/import.c:971
 #, 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:1174
+#: g10/import.c:1072
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1131
 #, 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:1247
+#: g10/import.c:1145
 #, 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:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1231
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, 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:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:226
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:335
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" è stato revocato."
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:376
-#, c-format
-msgid "Warning: user ID \"%s\" is not self-signed.\n"
-msgstr ""
-
-#: g10/keyedit.c:395
-#, 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:404
-#, 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:418
+#: g10/keyedit.c:364
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2333,81 +2249,76 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "è una firma locale.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:368
 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:442
+#: g10/keyedit.c:388
 #, 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:446
+#: g10/keyedit.c:393
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" era già stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:420
 msgid "This key has expired!"
 msgstr "Questa chiave è scaduta!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:440
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadrà il %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:444
 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:531
-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: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:533
+#: g10/keyedit.c:479
 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:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, 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:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2415,32 +2326,7 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:600
-#, fuzzy
-msgid ""
-"\n"
-"This will be a self-signature.\n"
-msgstr "questo può essere causato da una autofirma mancante\n"
-
-#: g10/keyedit.c:604
-#, 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:609
-#, 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:616
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2448,7 +2334,7 @@ msgstr ""
 "\n"
 "La firma sarà marcata come non esportabile.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2456,7 +2342,7 @@ msgstr ""
 "\n"
 "La firma sarà marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2464,7 +2350,7 @@ msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2472,41 +2358,41 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
-"Ho controllato questa chiave molto superficialmente.\n"
+"Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non è protetta.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "La chiave è protetta.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2514,7 +2400,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2522,580 +2408,554 @@ msgstr ""
 "Non vuoi una passphrase - questa è probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
 msgstr "firma la chiave irrevocabilmente"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente e irrevocabilmente"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "addkey"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "aggiungi una chiave secondaria"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "set preference list"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updated preferences"
 msgstr "preferenze aggiornate"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
 msgstr "mostra l'ID fotografico"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:913
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1047
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1092
 #, 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:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1183
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1252
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:1489
+#, c-format
+msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Questa chiave può essere revocata dalla chiave %s %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, 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:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave è stata revocata: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1827
-msgid "There are no preferences on a PGP 2.x-style key.\n"
-msgstr ""
-
-#: g10/keyedit.c:1835
-#, fuzzy
+#: g10/keyedit.c:1574
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
+"Please note that the shown key validity is not necessary 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:1923
+#: 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
 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:1928
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
-
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1697
 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:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "Inserisci le dimensioni della chiave"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:1955
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:1997
 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:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, 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:2671
+#: g10/keyedit.c:2284
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3105,7 +2965,7 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2452
 #, c-format
 msgid ""
 "\"\n"
@@ -3115,243 +2975,234 @@ msgstr ""
 "firmata localmente con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2457
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2461
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2465
 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:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2504
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2542
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmata da %08lX il %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2551
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, 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"
 
-#: g10/keylist.c:91
-#, fuzzy
-msgid "Critical signature policy: "
-msgstr "Politica di firma: "
-
-#: g10/keylist.c:93
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "Annotazione della firma: "
-
-#: g10/keylist.c:129
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
 msgstr "Portachiavi"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "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:958
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica è %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:378
 #, 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:419
+#: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:429 g10/mainproc.c:448
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, 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:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, 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:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "non è una firma separata\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -3368,48 +3219,30 @@ 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:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Attenzione: proprietario \"%s\" di %s insicuro\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Attenzione: permessi \"%s\" di %s insicuri\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non è presente\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: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: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:120
+#: g10/parse-packet.c:119
 #, 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:1057
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -3522,8 +3355,7 @@ 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
@@ -3551,40 +3383,34 @@ 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:101
+#: g10/pubkey-enc.c:100
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non è gestita\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:177
 #, 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:221
+#: g10/pubkey-enc.c:220
 #, 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:243
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
-msgid "NOTE: key has been revoked"
-msgstr "chiave %08lX: la chiave è stata revocata!\n"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3611,16 +3437,12 @@ msgstr "inviata con successo a `%s' (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "invio a `%s' fallito: status=%u\n"
 
-#: g10/hkp.c:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:521
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossibile cercare sul keyserver: %s\n"
@@ -3651,15 +3473,11 @@ 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"
+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
 #, c-format
@@ -3678,65 +3496,46 @@ msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
 #: g10/sig-check.c:318
 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"
-
-#: 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"
+msgstr "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
 
-#: g10/sign.c:151
+#: g10/sign.c:115
 #, 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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' è un file vuoto\n"
 
-#: g10/sign.c:644
-#, fuzzy
-msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:618
+msgid "you can only 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:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: 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
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 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:1029
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sarà usato il cifrario %s\n"
@@ -3820,8 +3619,7 @@ 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"
@@ -3898,8 +3696,7 @@ 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
@@ -3964,34 +3761,28 @@ 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:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 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:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica già presente\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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
@@ -4043,8 +3834,7 @@ 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"
@@ -4116,8 +3906,7 @@ 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"
 
@@ -4130,8 +3919,7 @@ 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
@@ -4143,8 +3931,7 @@ 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"
@@ -4160,17 +3947,13 @@ 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ù."
 
@@ -4180,28 +3963,19 @@ 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: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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4213,19 +3987,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4239,46 +4013,36 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 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:162
+#: g10/helptext.c:156
 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\"."
@@ -4287,46 +4051,36 @@ 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:200
+#: g10/helptext.c:194
 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:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4334,42 +4088,39 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:203
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:208
 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:219
+#: g10/helptext.c:213
 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:225
+#: g10/helptext.c:219
 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:229
+#: g10/helptext.c:223
 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"
@@ -4378,40 +4129,37 @@ 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:237
+#: g10/helptext.c:231
 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:244
+#: g10/helptext.c:238
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cioè una frase segreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:244
 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:254
+#: g10/helptext.c:248
 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:259
+#: g10/helptext.c:253
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4419,7 +4167,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sarà usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4437,8 +4185,7 @@ 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"
@@ -4448,7 +4195,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:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4458,11 +4205,11 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "Non è disponibile un aiuto"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non è disponibile un aiuto per `%s'"
@@ -4524,293 +4271,3 @@ 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 "Are you sure you still want to sign it?\n"
-#~ msgstr "Sei ancora sicuro di volerla firmare?\n"
-
-#~ msgid "  Are you sure you still want to sign it?\n"
-#~ msgstr "  Sei sicuro di volerla firmare comunque?\n"
-
-#~ msgid "Really sign? (y/N) "
-#~ msgstr "Firmo davvero? (s/N) "
-
-#~ msgid "too many random bits requested; the limit is %d\n"
-#~ msgstr "sono stati richiesti troppi bit casuali; il limite è %d\n"
-
-#~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[NOMI]|controlla il database della fiducia"
-
-#~ 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 "For info see http://www.gnupg.org"
-#~ msgstr "Per informazioni si veda http://www.gnupg.org"
-
-# valid user replies (not including 1..4)
-# [Marco, you can change 'm' and 's' to whatever letters you like]
-#~ 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 ""
-#~ "Impossibile trovare un percorso di fiducia valido fino alla chiave. "
-#~ "Vediamo\n"
-#~ "se possiamo assegnare qualche valore di fiducia del proprietario "
-#~ "mancante.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No path leading to one of our keys found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Non è stato trovato alcun percorso che porti a una delle nostre chiavi.\n"
-
-#~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr "Non è stato trovato alcun certificato con fiducia non definita.\n"
-
-#~ msgid ""
-#~ "No trust values changed.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nessun valore di fiducia modificato.\n"
-#~ "\n"
-
-#~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr ""
-#~ "%08lX: mancano informazioni per calcolare una probabilità di fiducia\n"
-
-#~ msgid "Enter the user ID: "
-#~ msgstr "Inserisci l'user ID: "
-
-#~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr "saltato: chiave pubblica già impostata con --encrypt-to\n"
-
-#~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: errore nel controllare la chiave: %s\n"
-
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
-
-#~ msgid "Do you really need such a large keysize? "
-#~ msgstr "Ti serve davvero una chiave così lunga? "
-
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: utente non trovato: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "problema di lettura del certificato: %s\n"
-
-#~ msgid "too many entries in unk cache - disabled\n"
-#~ msgstr "troppe voci nella unk cache - disabilitata\n"
-
-#~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
-#~ msgstr ""
-#~ "la chiave segreta %08lX non è stata importata (usa %s per permetterlo)\n"
-
-#~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
-
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: utente non trovato\n"
-
-#~ msgid "update of trustdb failed: %s\n"
-#~ msgstr "aggiornamento del trustdb fallito: %s\n"
-
-#~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr "non conosco nessun keyserver (usa l'opzione --keyserver)\n"
-
-#~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: non è un key ID valido\n"
-
-#~ msgid "assuming bad MDC due to an unknown critical bit\n"
-#~ msgstr ""
-#~ "si suppone un MDC non valido a causa di un bit critico sconosciuto\n"
-
-#~ msgid "error reading dir record for LID %lu: %s\n"
-#~ msgstr "errore durante la lettura del dir record per il LID %lu: %s\n"
-
-#~ msgid "lid %lu: expected dir record, got type %d\n"
-#~ msgstr "lid %lu: atteso un dir record, trovato uno di tipo %d\n"
-
-#~ msgid "no primary key for LID %lu\n"
-#~ msgstr "manca una chiave primaria per il LID %lu\n"
-
-#~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr ""
-#~ "errore durante la lettura della chiave primaria per il\n"
-#~ "LID %lu: %s\n"
-
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record fallito: %s\n"
-
-#~ msgid "key %08lX: query record failed\n"
-#~ msgstr "chiave %08lX: richiesta del record fallita\n"
-
-#~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "chiave %08lX: già nella tabella delle chiavi affidabili\n"
-
-#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "NOTA: la chiave segreta %08lX NON è protetta.\n"
-
-#~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n"
-
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "enumerate secret keys fallito: %s\n"
-
-#~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
-
-#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "chiave %08lX.%lu: Revoca della chiave valida\n"
-
-#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "chiave %08lX.%lu: Revoca della chiave non valida: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid subkey revocation\n"
-#~ msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n"
-
-#~ msgid "Good self-signature"
-#~ msgstr "Autofirma corretta"
-
-#~ msgid "Invalid self-signature"
-#~ msgstr "Autofirma non valida"
-
-#~ msgid "Valid user ID revocation skipped due to a newer self signature"
-#~ msgstr ""
-#~ "Saltata una revoca dell'user ID valida a causa di una autofirma più "
-#~ "recente"
-
-#~ msgid "Valid user ID revocation"
-#~ msgstr "Revoca dell'user ID valida"
-
-#~ msgid "Invalid user ID revocation"
-#~ msgstr "Revoca dell'user ID non valida"
-
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Revoca del certificato valida"
-
-#~ msgid "Good certificate"
-#~ msgstr "Certificato corretto"
-
-#~ msgid "Invalid certificate revocation"
-#~ msgstr "Certificato di revoca non valido"
-
-#~ msgid "Invalid certificate"
-#~ msgstr "Certificato non valido"
-
-#~ msgid "sig record %lu[%d] points to wrong record.\n"
-#~ msgstr "il sig recor di %lu[%d] punta al record sbagliato.\n"
-
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "certificato doppio - cancellato"
-
-#~ msgid "tdbio_search_dir failed: %s\n"
-#~ msgstr "tdbio_search_dir fallita: %s\n"
-
-#~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lid ?: inserimento fallito: %s\n"
-
-#~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lid %lu: inserimento fallito: %s\n"
-
-#~ msgid "lid %lu: inserted\n"
-#~ msgstr "lid %lu: inserito\n"
-
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "errore durante la lettura del dir record: %s\n"
-
-#~ msgid "\t%lu keys with errors\n"
-#~ msgstr "\t%lu chiavi con errori\n"
-
-#~ msgid "\t%lu keys inserted\n"
-#~ msgstr "\t%lu chiavi inserite\n"
-
-#~ msgid "lid %lu: dir record w/o key - skipped\n"
-#~ msgstr "lid %lu: dir record senza chiave - saltato\n"
-
-#~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "\t%lu a causa di nuove chiavi pubbliche\n"
-
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu chiavi saltate\n"
-
-#~ msgid "\t%lu keys updated\n"
-#~ msgstr "\t%lu chiavi aggiornate\n"
-
-#~ msgid "Ooops, no keys\n"
-#~ msgstr "Ooops, mancano le chiavi\n"
-
-#~ msgid "Ooops, no user IDs\n"
-#~ msgstr "Ooops, mancano gli user ID\n"
-
-#~ msgid "check_trust: search dir record failed: %s\n"
-#~ msgstr "check_trust: ricerca del dir record fallita: %s\n"
-
-#~ msgid "key %08lX: insert trust record failed: %s\n"
-#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
-
-#~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
-
-#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
-#~ msgstr ""
-#~ "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n"
-#~ "con l'orologio)\n"
-
-#~ msgid "key %08lX.%lu: expired at %s\n"
-#~ msgstr "chiave %08lX.%lu: scaduta il %s\n"
-
-#~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
-
-#~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr "problema cercando `%s' nel trustdb: %s\n"
-
-#~ msgid "user '%s' not in trustdb - inserting\n"
-#~ msgstr "l'utente `%s' non è nel trustdb - viene inserito\n"
-
-#~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr "impossibile mettere `%s' nel trustdb: %s\n"
-
-#~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr "ATTENZIONE: non è ancora possibile gestire record pref lunghi\n"
-
-#~ msgid "%s: can't create keyring: %s\n"
-#~ msgstr "%s: impossibile creare il portachiavi: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 170d0c94f..d82181a06 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-04-20 23:43+0900\n"
+"Project-Id-Version: gnupg 1.0.7\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-05-10 07:28-0400\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "quit"
 
@@ -275,7 +275,7 @@ 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:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó: %s\n"
@@ -340,7 +340,7 @@ msgstr ""
 "¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +351,7 @@ msgstr ""
 "½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£OS¤¬¤â¤Ã¤ÈÍ𻨤µ¤ò¼ý½¸\n"
 "¤Ç¤­¤ë¤è¤¦¡¢²¿¤«¤·¤Æ¤¯¤À¤µ¤¤! (¤¢¤È%d¥Ð¥¤¥È¤¤¤ê¤Þ¤¹)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -359,165 +359,165 @@ msgstr ""
 "@¥³¥Þ¥ó¥É:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[¥Õ¥¡¥¤¥ë]|½ð̾¤òºîÀ®"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[¥Õ¥¡¥¤¥ë]|¥¯¥ê¥¢½ð̾¤òºîÀ®"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "ʬΥ½ð̾¤òºîÀ®"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "¥Ç¡¼¥¿¤ò°Å¹æ²½"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
 msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤ò°Å¹æ²½"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "°Å¹æ²½¤Ë¤ÏÂоΰŹæË¡¤Î¤ß¤ò»ÈÍÑ"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "Êݸ¤Î¤ß"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "¥Ç¡¼¥¿¤òÉü¹æ (´ûÄê)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
 msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤òÉü¹æ"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "¸°¤È½ð̾¤Î°ìÍ÷"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "¸°¤Î½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "¸°¤È»ØÌæ¤Î°ìÍ÷"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "ÈëÌ©¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "¿·¤·¤¤¸°ÂФòÀ¸À®"
 
-#: g10/g10.c:320
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
 msgstr "¸ø³«¸°Îؤ«¤é¸°·²¤òºï½ü"
 
-#: g10/g10.c:322
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
 msgstr "ÈëÌ©¸°Îؤ«¤é¸°·²¤òºï½ü"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "¸°¤Ë½ð̾"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/g10.c:325
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ë½ð̾"
 
-#: g10/g10.c:326
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "¸°¤Ø¤Î½ð̾¤äÊÔ½¸"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "ÇË´þ¾ÚÌÀ½ñ¤òÀ¸À®"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "¸°¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Ë¸°¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à"
 
-#: g10/g10.c:334
+#: g10/g10.c:320
 msgid "search for keys on a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸°¤ò¸¡º÷¤¹¤ë"
 
-#: g10/g10.c:336
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÁ´Éô¹¹¿·¤¹¤ë"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "¸°¤ÎÆɹþ¤ß/Ê»¹ç"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "¥Ñ¥±¥Ã¥ÈÎó¤Î¤ß¤Î°ìÍ÷"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿ÃͤòÆɤ߹þ¤à"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·"
 
-#: g10/g10.c:350
+#: g10/g10.c:336
 msgid "unattended trust database update"
 msgstr "¼êÅö¤Æ¤·¤Æ¤Ê¤¤¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "²õ¤ì¤¿¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò½¤Éü"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎ\n"
 "ÊñÁõ½üµî"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÊñÁõ²½"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -527,234 +527,238 @@ msgstr ""
 "¥ª¥×¥·¥ç¥ó:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾Á°|´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤Æ\n"
 "¡Ö̾Á°¡×¤ò»ÈÍÑ"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "´ûÄê¤Î¼õ¿®¼Ô¤Ë´ûÄê¤Î¸°¤ò»ÈÍÑ"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "½ð̾¤äÉü¹æ¤Ë¤³¤Î¥æ¡¼¥¶¡¼id\n"
 "¤ò»ÈÍÑ"
 
-#: g10/g10.c:376
+#: g10/g10.c:362
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|°µ½Ì¥ì¥Ù¥ë¤òN¤ËÀßÄê\n"
 "(0¤ÏÈó°µ½Ì)"
 
-#: g10/g10.c:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "Àµ½à¥Æ¥­¥¹¥È¡¦¥â¡¼¥É¤ò»ÈÍÑ"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "¾éĹ"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "¤ä¤äÀŤ«"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "üËö¤òÉÔ»ÈÍÑ"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "¶¯À©Åª¤Ëv3½ð̾"
 
-#: g10/g10.c:390
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
 msgstr "v3½ð̾¤ò¶¯À©¤·¤Ê¤¤"
 
-#: g10/g10.c:391
+#: g10/g10.c:377
 msgid "force v4 key signatures"
 msgstr "¶¯À©Åª¤Ëv4½ð̾"
 
-#: g10/g10.c:392
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
 msgstr "v4½ð̾¤ò¶¯À©¤·¤Ê¤¤"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
 msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤ËMDC¤ò»ÈÍÑ"
 
-#: g10/g10.c:395
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
 msgstr "°Å¹æ²½¤Ë¤ÏÀäÂФËMDC¤ò»ÈÍѤ·¤Ê¤¤"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "̵Êѹ¹"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "gpg¥¨¡¼¥¸¥§¥ó¥È¤ò»ÈÍÑ"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É: ³Îǧ¾Êά"
 
-#: g10/g10.c:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr ""
 "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïyes\n"
 "¤È¤ß¤Ê¤¹"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr ""
 "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïno\n"
 "¤È¤ß¤Ê¤¹"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "¸°ÎؤΰìÍ÷¤Ë¤³¤Î¸°ÎؤòÄɲÃ"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "°ìÍ÷¤Ë¤³¤ÎÈëÌ©¸°ÎؤòÄɲÃ"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
 msgstr "°ìÍ÷¤Î¸°¤¬¤¢¤ë¸°Îؤòɽ¼¨"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾Á°|´ûÄê¤ÎÈëÌ©¸°¤È¤·¤Æ\n"
 "¡Ö̾Á°¡×¤ò»ÈÍÑ"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|¥Û¥¹¥È|¸°¤Î¸¡º÷¤Ë¤³¤Î¸°¥µ¡¼¥Ð¡¼¤ò»ÈÍÑ"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|üËö¤Îcharset¤ò¡ÖCHARSET̾¡×\n"
 "¤ËÀßÄê"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤ò\n"
 "Æɤ߹þ¤à"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|¥Õ¥¡¥¤¥ëµ­½Ò»Ò|¤³¤Î¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë¾õÂÖ¤ò\n"
 "½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:418
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
 msgstr ""
 "|¥Õ¥¡¥¤¥ë|¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤ò¥Õ¥¡¥¤¥ë¤Ë\n"
 "½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|¸°ID|¤³¤Î¸°¤òµæ¶ËŪ¤Ë¿®ÍѤ¹¤ë"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|¥Õ¥¡¥¤¥ë|³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤ò\n"
 "Æɤ߹þ¤à"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤ò\n"
 "»ÈÍÑ"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤È½ð̾¤Î¥ª¥×¥·¥ç\n"
 "¥ó¤òÁ´¤ÆOpenPGP¤Î¿¶Éñ¤ËÀßÄê"
 
-#: g10/g10.c:434
+#: g10/g10.c:414
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤ÈÍ×Ìó¤Î¥ª¥×¥·¥ç\n"
 "¥ó¤òÁ´¤ÆPGP 2.x¤Î¿¶Éñ¤ËÀßÄê"
 
-#: g10/g10.c:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¡¦¥â¡¼¥ÉN¤ò»ÈÍÑ"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î¥á¥Ã\n"
 "¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:444
+#: g10/g10.c:422
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î°Å¹æ\n"
 "¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾Á°|¡Ö̾Á°¡×¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ò\n"
 "»ÈÍÑ"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾Á°|¡Ö̾Á°¡×¤Î¥á¥Ã¥»¡¼¥¸Í×Ìó\n"
 "¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾Á°|¡Ö̾Á°¡×¤Î°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ò\n"
 "»ÈÍÑ"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸°ID¥Õ¥£¡¼¥ë¥É\n"
 "¤òÁ÷½Ð"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
 msgstr "¥Õ¥©¥ÈID¤òɽ¼¨"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
 msgstr "¥Õ¥©¥ÈID¤òɽ¼¨¤·¤Ê¤¤"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "¥Õ¥©¥ÈID¤ò±ÜÍ÷¤¹¤ë¥³¥Þ¥ó¥É¹Ô\n"
 "¤òÀßÄê"
 
-#: g10/g10.c:459
+#: g10/g10.c:431
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|̾Á°=ÃÍ|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤ò»ÈÍÑ"
+
+#: g10/g10.c:434
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -763,7 +767,7 @@ msgstr ""
 "(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n"
 "¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -783,15 +787,15 @@ msgstr ""
 " --list-keys [̾Á°]         ¸°¤òɽ¼¨\n"
 " --fingerprint [̾Á°]       »ØÌæ¤òɽ¼¨\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs@gnu.org> ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -801,7 +805,7 @@ msgstr ""
 "½ð̾¡¢¸¡¾Ú¡¢°Å¹æ²½¤äÉü¹æ\n"
 "´ûÄê¤ÎÆ°ºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -809,275 +813,258 @@ msgstr ""
 "\n"
 "¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥¢¥ë¥´¥ê¥º¥à:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "¥³¥Þ¥ó¥É¤Î¾×ÆÍ\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s'¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s¤ÏÀµ¤·¤¤Ê¸»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURI¤ò²òÀÏÉÔǽ\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1228
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n"
 
-#: g10/g10.c:1476
+#: g10/g10.c:1251 g10/g10.c:1267
+#, c-format
+msgid "WARNING: %s is a deprecated option.\n"
+msgstr "·Ù¹ð: %s¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
+
+#: g10/g10.c:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr "\"--keyserver-options %s\"¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
+
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Ãí°Õ: ÉáÄÌ%s¤ÏÍѤ¤¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1525
+#: g10/g10.c:1395
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1531
+#: g10/g10.c:1401
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1414
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤ÏIDEA°Å¹æ¤¬Í׵ᤵ¤ì¤Þ¤¹ \n"
 
-#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏPGP 2.x¤Ç¤Ï»ÈÍѤǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: g10/g10.c:1499
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï%d..%d¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1508
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1512
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1516
 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:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
-
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
-
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
 msgstr "̵¸ú¤ÊÍ¥Àè½ç°Ì\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à`%s'¤Ç¤¹\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2101
 msgid "Go ahead and type your message ...\n"
 msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤ ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2474
-#, fuzzy
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\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"
 msgstr ""
 "Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢¤Î¤ß¤òÍѤ¤¡¢\n"
 "'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2325
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
+
+#: g10/g10.c:2333
 msgid "a notation value must not use any control characters\n"
 msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2520
-msgid "the given certification policy URL is invalid\n"
-msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
-
-#: g10/g10.c:2522
-msgid "the given signature policy URL is invalid\n"
-msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
-
 #: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
@@ -1147,8 +1134,7 @@ 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"
@@ -1174,13 +1160,11 @@ msgid "User ID is no longer valid"
 msgstr "¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "ÇË´þÍýͳ: "
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "ŬÍÑ: "
 
 #. a string with valid answers
@@ -1282,8 +1266,7 @@ 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
@@ -1349,8 +1332,7 @@ 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
@@ -1362,29 +1344,28 @@ 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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n"
 
-#: g10/pkclist.c:803
+#: g10/pkclist.c:752
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò»ØÄꤷ¤Æ¤¤¤Þ¤»¤ó (¡Ö-r¡×¤òÍѤ¤¤Þ¤·¤ç¤¦) ¡£\n"
 
-#: g10/pkclist.c:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1392,130 +1373,120 @@ msgstr ""
 "\n"
 "¥æ¡¼¥¶¡¼ID¤òÆþÎÏ¡£¶õ¹Ô¤Ç½ªÎ»: "
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤ÆÀßÄêºÑ¤ß¤Ç¤¹\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹¡£\n"
 
-#: g10/pkclist.c:862
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
 msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤ÏÀßÄêºÑ¤ß¤Ç¤¹\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "´ûÄê¤Î¼õ¿®¼Ô`%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "Áª¹¥%c%lu¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:189
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "Áª¹¥%c%lu¤Î½ÅÊ£\n"
 
-#: g10/keygen.c:194
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "¿¤¹¤®¤ë`%c'Áª¹¥\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:257
 msgid "invalid character in preference string\n"
 msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:524
-#, fuzzy
-msgid "writing direct signature\n"
-msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
-
-#: g10/keygen.c:563
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "½ð̾¤ËÂбþ¤¹¤ë¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵¸ú¤Ê¸°¥µ¥¤¥º¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "¸°¥µ¥¤¥º¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "¤¹¤­¤Ê¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA¤ÈElGamal (´ûÄê)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (½ð̾¤Î¤ß)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (½ð̾¤Î¤ß)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (°Å¹æ²½¤Î¤ß)\n"
 
-#: g10/keygen.c:953
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (½ð̾¤È°Å¹æ²½)\n"
-
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "¤É¤ì¤Ë¤·¤Þ¤¹¤«? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹ - ¤½¤ì¤Ç¤âºî¤ê¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1528,19 +1499,19 @@ msgstr ""
 "             ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n"
 "         ºÇÂç¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:1030
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n"
 
@@ -1552,12 +1523,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:1041
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "¸°Ä¹¤¬Â礭¤¹¤®¤Þ¤¹¡£%d¤¬ºÇÂç¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1565,29 +1536,27 @@ msgstr ""
 "2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
 "¿ä¾©¤·¤Þ¤»¤ó!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤¤¤¤¤Ç¤¹¤«? "
 
-#: g10/keygen.c:1050
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:875
+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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Í׵ᤵ¤ì¤¿¸°Ä¹¤Ï%u¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1603,7 +1572,7 @@ msgstr ""
 "      <n>m = Í­¸ú´ü¸Â n ¤«·î´Ö\n"
 "      <n>y = Í­¸ú´ü¸Â n ǯ´Ö\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1619,30 +1588,30 @@ msgstr ""
 "      <n>m = Í­¸ú´ü¸Â n ¤«·î´Ö\n"
 "      <n>y = Í­¸ú´ü¸Â n ǯ´Ö\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "¸°¤ÎÍ­¸ú´ü´Ö¤Ï? (0)"
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "½ð̾¤ÎÍ­¸ú´ü´Ö¤Ï? (0)"
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "̵¸ú¤ÊÃÍ\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s¤Ï̵´ü¸Â¤Ç¤¹\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s¤Ï%s¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1650,15 +1619,14 @@ msgstr ""
 "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n"
 "2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "¤³¤ì¤Ç¤¤¤¤¤Ç¤¹¤« (y/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -1670,44 +1638,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "ËÜ̾: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "̾Á°¤ò¿ô»ú¤Ç»Ï¤á¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾Á°¤Ï5ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "¥³¥á¥ó¥È: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "¥³¥á¥ó¥È¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç`%s'¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1718,27 +1686,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òËÜ̾¤ä¥³¥á¥ó¥È¤ËÆþ¤ì¤Ê¤¤¤è¤¦¤Ë\n"
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤Ï½ªÎ»(Q)? "
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤ÏOK(O)¤«½ªÎ»(Q)? "
 
-#: g10/keygen.c:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "¤Þ¤º¥¨¥é¡¼¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1746,16 +1714,16 @@ msgstr ""
 "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:701 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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"
@@ -1767,7 +1735,7 @@ msgstr ""
 "¤Î¡Ö--edit-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1246
 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"
@@ -1778,53 +1746,53 @@ msgstr ""
 "¤È¤«¡¢¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤«¤Î¾¤Î¤³¤È¤ò¤¹¤ë¤È¡¢Íð¿ôÀ¸À®»Ò¤Ç\n"
 "Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s'¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s'¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸ø³«¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "½ñ¹þ¤ß²Äǽ¤ÊÈëÌ©¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "¸ø³«¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ÈëÌ©¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºî¤ê¡¢½ð̾¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:2253
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤È¤·¤Æµ­Ï¿¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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"
@@ -1832,111 +1800,97 @@ msgstr ""
 "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n"
 "¡Ö--edit-key¡×¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Ãí°Õ: v3¸°¤ÎÉû¸°¤ÎºîÀ®¤Ï¡¢OpenPGP¤ËŬ¹ç¤·¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "ËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
 msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n"
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:92 g10/encode.c:296
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s'¤Ï´û¤Ë°µ½ÌºÑ¤ß¤Ç¤¹\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
-#: g10/tdbio.c:552
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ·Ù¹ð: ¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 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:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/encode.c:402
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:347
+msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "°Å¹æ²½¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤ÏÁ´ÉôIDEA°Å¹æ¤ò»È¤¨¤Þ¤»¤ó¡£\n"
 
-#: g10/encode.c:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 g10/sign.c:758
-#, fuzzy, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: g10/encode.c:646
+#: g10/encode.c:563
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s°Å¹æ²½ ¼õ¿®¼Ô: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:141 g10/keyedit.c:2211
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "¸°`%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "¸°¥Ö¥í¥Ã¥¯¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "¸° %08lX: rfc2440¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n"
 
-#: g10/export.c:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "¸° %08lX: Êݸ¤ì¤Æ¤¤¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n"
 
-#: g10/export.c:196
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "¸° %08lX: PGP 2.x·Á¼°¤Î¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/export.c:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "·Ù¹ð: ²¿¤â½ñ¤­½Ð¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
@@ -1946,21 +1900,21 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%08lX¤Ç¤¹\n"
 
-#: g10/getkey.c:2100
+#: g10/getkey.c:1989
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n"
 
-#: g10/getkey.c:2147
+#: g10/getkey.c:2036
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹¡£¥¹¥­¥Ã¥×\n"
@@ -2040,183 +1994,177 @@ msgstr "       ÈëÌ©¸°¤ÎÆɹþ¤ß: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵Êѹ¹¤ÎÈëÌ©¸°: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:544
+#: g10/import.c:455
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "¸°%08lX: ¼õÍý¤·¤¿Ì¤¼«¸Ê½ð̾¤Î¥æ¡¼¥¶¡¼ID '%s'\n"
 
-#: g10/import.c:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "¸°%08lX: ¿®ÍѤǤ­¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 msgid "this may be caused by a missing self-signature\n"
 msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n"
 
-#: g10/import.c:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "¸° %08lX: ¿·¤·¤¤¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:578
+#: g10/import.c:489
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s'¤Ø¤Î½ñ½Ð¤·\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤È¹ç¤¤¤Þ¤»¤ó\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ť±¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò1¸Ä\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò%d¸Ä\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò1¸Ä\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò%d¸Ä\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "¸°%08lX: Êѹ¹¤Ê¤·\n"
 
-#: g10/import.c:770
+#: g10/import.c:671
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "´ûÄê¤ÎÈëÌ©¸°Îؤ¬¤¢¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "¸°%08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
 #. we can't merge secret keys
-#: g10/import.c:785
+#: g10/import.c:686
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "¸°%08lX: ´û¤ËÈëÌ©¸°Îؤˤ¢¤ê¤Þ¤¹\n"
 
-#: g10/import.c:790
+#: g10/import.c:691
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "¸°%08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/import.c:819
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "¸°%08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ÇË´þ¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/import.c:859
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - µñÈÝ\n"
 
-#: g10/import.c:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "¸°%08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:941
+#: g10/import.c:839
 #, 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:943
+#: g10/import.c:841
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id \"%s\" ¤Î¼«¸Ê½ð̾¤¬Ìµ¸ú¤Ç¤¹\n"
 
-#: g10/import.c:960
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "¸°%08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "¸°%08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶¡¼ID '"
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n"
@@ -2225,125 +2173,106 @@ 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:1047
+#: g10/import.c:945
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "¸°%08lX: ½ñ½Ð¤·ÉԲĤʽð̾ (¥¯¥é¥¹%02x) - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:1056
+#: g10/import.c:954
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:1073
+#: g10/import.c:971
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1072
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "¸°%08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶¡¼ID¤Î¸¡½Ð - Ê»¹ç\n"
 
-#: g10/import.c:1233
+#: g10/import.c:1131
 #, c-format
 msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr "·Ù¹ð: ¸°%08lX¤ÏÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ÇË´þ¸°%08lX¤Î°ú¤­½Ð¤·\n"
 
-#: g10/import.c:1247
+#: g10/import.c:1145
 #, c-format
 msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr "·Ù¹ð: ¸°%08lX¤ÏÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ÇË´þ¸°%08lX¤ÏÉԺߡ£\n"
 
-#: g10/import.c:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1231
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "¸°%08lX: ľÀܸ°½ð̾¤òÄɲÃ\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[ÇË´þ]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
 msgstr "[¼«¸Ê½ð̾]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "̵¸ú¤Ê½ð̾1¸Ä\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵¸ú¤Ê½ð̾%d¸Ä\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 msgid "1 signature not checked due to a missing key\n"
 msgstr "¸°¤¬¤Ê¤¤¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "¸°¤¬¤Ê¤¤¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 msgid "1 signature not checked due to an error\n"
 msgstr "¥¨¥é¡¼¤Î¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "¥¨¥é¡¼¤Î¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:226
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä¸¡½Ð\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä¸¡½Ð\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:335
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "¥æ¡¼¥¶¡¼ID \"%s\" ¤ÏÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 msgid "  Unable to sign.\n"
 msgstr "  ½ð̾ÉÔǽ¡£\n"
 
-#: g10/keyedit.c:376
-#, c-format
-msgid "Warning: user ID \"%s\" is not self-signed.\n"
-msgstr ""
-
-#: g10/keyedit.c:395
-#, 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:404
-#, 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:418
+#: g10/keyedit.c:364
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2352,110 +2281,81 @@ msgstr ""
 "\"%s\" ¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n"
 "ÆâÉô½ð̾¤Ç¤¹¡£\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:368
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "½ñ½Ð¤·²Äǽ¤Ê½ð̾¤Ë³Ê¾å¤²¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:388
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦ÆâÉô½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:393
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "¸°%08lX¤Ç½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:420
 msgid "This key has expired!"
 msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:440
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "¤³¤Î¸°¤Ï%s¤Ç´ü¸Â¤¬ÀÚ¤ì¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:498
-#, fuzzy
+#: g10/keyedit.c:444
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Ʊ»þ¤Ë½ð̾¤â´ü¸ÂÀÚ¤ì¤Ë¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
+msgstr "Ʊ»þ¤Ë½ð̾¤â´ü¸ÂÀÚ¤ì¤Ë¤·¤¿¤¤¤Ç¤¹¤«? (Y/n) "
 
-#: g10/keyedit.c:531
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\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 "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x¸°¤ÇOpenPGP½ð̾¤¬¤Ç¤­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:479
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "¤³¤Î¸°¤ÏPGP 2.x¤Ç»ÈÍѤǤ­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Åú¤¨¤Þ¤»¤ó¡£%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Á´Á³¡¢³Îǧ¤·¤Æ¤¤¤Þ¤»¤ó¡£%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) °ì±þ¡¢³Îǧ¤·¤Þ¤·¤¿¡£%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ¤«¤Ê¤êÃí°Õ¤·¤Æ³Îǧ¤·¤Þ¤·¤¿¡£%s\n"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "ËÜÅö¤Ë¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤Æ¤è¤¤¤Ç¤¹¤«: \""
 
-#: g10/keyedit.c:600
-#, fuzzy
-msgid ""
-"\n"
-"This will be a self-signature.\n"
-msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n"
-
-#: g10/keyedit.c:604
-#, fuzzy
-msgid ""
-"\n"
-"Warning: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"½ð̾¤Ï½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
-
-#: g10/keyedit.c:609
-#, fuzzy
-msgid ""
-"\n"
-"Warning: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"½ð̾¤ÏÇË´þÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
-
-#: g10/keyedit.c:616
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2463,7 +2363,7 @@ msgstr ""
 "\n"
 "½ð̾¤Ï½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2471,7 +2371,7 @@ msgstr ""
 "\n"
 "½ð̾¤ÏÇË´þÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2479,7 +2379,7 @@ msgstr ""
 "\n"
 "¤³¤Î¸°¤ÏÁ´Á³¡¢³Îǧ¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2487,7 +2387,7 @@ msgstr ""
 "\n"
 "¤³¤Î¸°¤Ï°ì±þ¡¢³Îǧ¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2495,33 +2395,33 @@ msgstr ""
 "\n"
 "¤³¤Î¸°¤Ï¡¢¤«¤Ê¤êÃí°Õ¤·¤Æ³Îǧ¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 msgid "Secret parts of primary key are not available.\n"
 msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "¤³¤Î¸°¤ÏÊÔ½¸¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2529,7 +2429,7 @@ msgstr ""
 "¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2538,578 +2438,553 @@ msgstr ""
 "¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "ËÜÅö¤Ë¼Â¹Ô¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "¸°¤Î½ð̾¤òÀµ¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "Êݸ¤·¤Æ½ªÎ»"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "¤³¤Î¥Ø¥ë¥×¤ò¸«¤ë"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "»ØÌæ¤ò¸«¤ë"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "Éû¸°N¤ÎÁªÂò"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "½ð̾¤Î°ìÍ÷"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
 msgstr "¸°¤Ø½ð̾"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
 msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
 msgstr "ÇË´þ¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "add a photo ID"
 msgstr "¥Õ¥©¥ÈID¤ÎÄɲÃ"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "Éû¸°¤ÎÄɲÃ"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "Éû¸°¤Îºï½ü"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "addkey"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "Éû¸°¤ÎÄɲÃ"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "½ð̾¤Îºï½ü"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "Í­¸ú´ü¸Â¤ÎÊѹ¹"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¼ç¤Ë¤¹¤ë"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle between secret and public key listing"
 msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤ÎÀÚÂؤ¨"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
 msgstr "Áª¹¥¤Î°ìÍ÷ (¥¨¥­¥¹¥Ñ¡¼¥È)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
 msgstr "Áª¹¥¤Î°ìÍ÷ (¾éĹ)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "set preference list"
 msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updated preferences"
 msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "½ð̾¤ÎÇË´þ"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "Éû¸°¤ÎÇË´þ"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
 msgstr "¥Õ¥©¥ÈID¤òɽ¼¨"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:913
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯`%s'¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "¥³¥Þ¥ó¥É> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "¤Þ¤º¡Ötoggle¡×¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1047
 msgid "Key is revoked."
 msgstr "¸°¤ÏÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1092
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤òÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 msgid "Do you really want to revoke the selected keys? "
 msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1183
 msgid "Do you really want to revoke this key? "
 msgstr "¤³¤Î¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1252
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
 msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 msgid "Key not changed so no update needed.\n"
 msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤Ï¤¤¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Öhelp¡×¤ò»²¾È)\n"
 
-#: g10/keyedit.c:1740
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:1489
+#, c-format
+msgid "This key may be revoked by %s key %s%s\n"
 msgstr "¤³¤Î¸°¤Ï%s¸°%s%s¤Ë¤è¤Ã¤ÆÇË´þ¤µ¤ì¤¿¤è¤¦¤Ç¤¹\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
 msgstr " (¥Ç¥ê¥±¡¼¥È)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ºîÀ®: %s ´ü¸Â: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "rev- ¤Ç¤Ã¤Á¤¢¤²¤ÎÇË´þ¤òȯ¸«\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? ÇË´þ³Îǧ¾ã³²: %s\n"
 
-#: g10/keyedit.c:1827
-msgid "There are no preferences on a PGP 2.x-style key.\n"
-msgstr ""
-
-#: g10/keyedit.c:1835
-#, fuzzy
+#: g10/keyedit.c:1574
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
+"Please note that the shown key validity is not necessary correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n"
 "¤È¤¤¤¦¤³¤È¤òǰƬ¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1660
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
-"versions\n"
-"         of PGP to reject this key.\n"
+"WARNING: This key already has a photo ID.\n"
+"         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
-"·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n"
-"      ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
+"·Ù¹ð: ¤³¤Î¸°¤Ë¤Ï¤â¤¦¥Õ¥©¥ÈID¤¬¤¢¤ê¤Þ¤¹¡£\n"
+"      °ã¤¦¥Õ¥©¥ÈID¤òÄɲ乤ë¤È¡¢°ìÉô¤ÎÈǤÎPGP¤Ïº®Í𤹤뤫¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1928
+#: 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:1934
+#: 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"
+"         of PGP to reject this key.\n"
+msgstr ""
+"·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n"
+"      ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
+
+#: g10/keyedit.c:1697
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:1955
 msgid "Changing expiration time for the primary key.\n"
 msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:1997
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id \"%s\" ¤Î¼«¸Ê½ð̾¤¬Ìµ¸ú¤Ç¤¹\n"
-
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2284
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "¥æ¡¼¥¶¡¼ID: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3118,7 +2993,7 @@ msgstr ""
 "\"\n"
 "¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2452
 #, c-format
 msgid ""
 "\"\n"
@@ -3127,242 +3002,234 @@ msgstr ""
 "\"\n"
 "¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤ËÆâÉôŪ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2457
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2461
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¤½¤ì¤Ç¤âÇË´þ¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2465
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤·¤¿:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2504
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX¤Ç%s¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2542
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX¤Ç%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
 msgstr " (½ñ½Ð¤·ÉÔ²Ä)"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2551
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "ÇË´þ¾ÚÌÀ½ñ¤òËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, 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"
 
-#: g10/keylist.c:91
-#, fuzzy
-msgid "Critical signature policy: "
-msgstr "½ð̾¥Ý¥ê¥·¡¼: "
-
-#: g10/keylist.c:93
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
 msgstr "½ð̾¥Ý¥ê¥·¡¼: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "½ð̾Ãí¼á: "
-
-#: g10/keylist.c:129
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
 msgstr "½ð̾Ãí¼á: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
 msgstr "¿Í¤Ë¤ÏÆɤá¤Þ¤»¤ó"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
 msgstr "¸°ÎØ"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [Í­¸ú´ü¸Â: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "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:958
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "                    »ØÌæ:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
 msgstr "                »ØÌæ ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤ÃΤΥ¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "¸ø³«¸°¤Ï%08lX¤Ç¤¹\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
 msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤DEK¤Ç¤¹\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u-¥Ó¥Ã¥È%s¸°, ID %08lX¤Ç°Å¹æ²½%s¤Ë¤Ç¤­¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s¸°, ID %08lX¤Ç°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:429 g10/mainproc.c:448
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿¤ò²¾Äê\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA°Å¹æ¤ÏÍøÍÑÉÔǽ¤Ê¤Î¤Ç¡¢³ÚŷŪ¤Ç¤¹¤¬%s¤ÇÂåÍѤ·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "Éü¹æ¤ËÀ®¸ù\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "·Ù¹ð: °Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï²þã⤵¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Éü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆâ½ï¤Ë¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë̾='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ÆÈΩÇË´þ¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Ãí¼á: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "¥Ý¥ê¥·¡¼: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "½ð̾¤Î¸¡¾Ú¤ò¾Êά\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "¤³¤Î¿½Å½ð̾¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ¤Î%s¸°ID %08lX¤Ë¤è¤ë½ð̾\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "ÉÔÀµ¤Ê ½ð̾: \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾: \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Àµ¤·¤¤½ð̾: \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[ÉÔ³ÎÄê]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "       ÊÌ̾ \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "ʬΥ½ð̾¤Ç¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "¥¯¥é¥¹0x%02x¤ÎÆÈΩ½ð̾\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Î½ð̾\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n"
 
@@ -3381,46 +3248,30 @@ msgstr ""
 "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 "¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤!\n"
 
-#: g10/misc.c:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "·Ù¹ð: %s \"%s\" ¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "·Ù¹ð: %s \"%s\" ¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA°Å¹æ¤Î¥×¥é¥°¥¤¥ó¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/misc.c:444
-msgid ""
-"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:436
+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/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
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/parse-packet.c:1057
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "¥¿¥¤¥×%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n"
@@ -3563,39 +3414,34 @@ msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó\n"
 msgid "can't open signed data `%s'\n"
 msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿`%s'¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:101
+#: g10/pubkey-enc.c:100
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "ƿ̾¤Î¼õ¿®¼ÔÍѤǤ¹¡£ÈëÌ©¸°%08lX¤òÍѤ¤¤Þ¤¹ ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "½ªÎ»¡£Æ¿Ì¾¤Î¼õ¿®¼ÔÍѤǤ¹¡£\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:177
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Êݸ¥ë¥´¥ê¥º¥à%d%s¤Ï̤ÃΤ«»ÈÍÑÉԲĤǤ¹\n"
 
-#: g10/pubkey-enc.c:221
+#: g10/pubkey-enc.c:220
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:243
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
-msgid "NOTE: key has been revoked"
-msgstr "¸°%08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3622,16 +3468,12 @@ msgstr "`%s'¤Ø¤ÎÁ÷¿®¤ËÀ®¸ù (¾õÂÖ=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "`%s'¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¾õÂÖ=%u\n"
 
-#: g10/hkp.c:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "\"%s\"¤òHKP¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:521
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ò¸¡º÷¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -3663,8 +3505,7 @@ 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"
+msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "¤³¤ì¤ÏPGP¤ÎÀ¸À®¤·¤¿ElGamal¸°¤Ç¤¹¡£\n"
 "½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢¤³¤Î¸°¤Ï°ÂÁ´¤Ç¤Ï ¤Ê¤¤ ¤Ç¤¹!\n"
@@ -3688,56 +3529,44 @@ msgstr "Ãí°Õ: ½ð̾¸°%08lX¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢½ð̾¤ÏÉÔÀµ¤À¤È¤ß¤Ê¤·¤Þ¤¹\n"
 
-#: 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
+#: g10/sign.c:115
 #, 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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "ºîÀ®¤µ¤ì¤¿½ð̾¤Î¸¡¾Ú¤Ë¼ºÇÔ: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s½ð̾¡£½ð̾¼Ô: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "·Ù¹ð: `%s'¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
 
-#: g10/sign.c:644
-#, fuzzy
-msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:618
+msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç½ð̾¤Ç¤­¤ë¤À¤±¤Ç¤¹\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: g10/sign.c:784
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "½ð̾:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 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:1029
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s°Å¹æ²½¤ò»ÈÍѤ·¤Þ¤¹\n"
@@ -3821,8 +3650,7 @@ 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"
@@ -3879,8 +3707,7 @@ 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
@@ -3965,31 +3792,29 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "ÆþÎϤÎ%u¹ÔÌܤ¬Ä¹¤¹¤®¤ë¤«¡¢LF¤¬¤Ê¤¤¤è¤¦¤Ç¤¹\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "¤ä¤Ð¤¯¤Æ¤â¤¤¤¤¥Õ¥é¥°¤¬¸°¤Ë¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "µ¶ÊªÍð¿ôÀ¸À®»Ò¤È¤Ï¤¤¤Ã¤·¤ç¤Ë»È¤¨¤Þ¤»¤ó!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s'¤ò¥¹¥­¥Ã¥×: ½ÅÊ£\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s'¤ò¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "¥¹¥­¥Ã¥×: ÈëÌ©¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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"
@@ -4042,8 +3867,7 @@ 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
@@ -4124,8 +3948,7 @@ 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
@@ -4137,8 +3960,7 @@ 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"
@@ -4174,23 +3996,15 @@ msgstr ""
 "¤Ê¤¼¤Ê¤é¡¢¤³¤ì¤é¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥×¥í¥°¥é¥à¤¬¤¢¤ê¡¢\n"
 "ºîÀ®¤µ¤ì¤ë½ð̾¤ÏÈó¾ï¤ËŤ¯¤Æ¡¢¸¡¾Ú¤Ë¤â»þ´Ö¤¬¤«¤«¤ë¤¿¤á¤Ç¤¹¡£"
 
-#: 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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "¡Öyes¡×¤«¡Öno¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4202,19 +4016,19 @@ msgstr ""
 "ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤½¤ÎÂå¤ê¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´ü´Ö¤ØÊÑ´¹¤¹¤ë\n"
 "¤è¤¦¤Ë»î¤ß¤Þ¤¹¡£"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "¸°¥Û¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 msgid "please enter an optional but highly suggested email address"
 msgstr "¥ª¥×¥·¥ç¥ó¤Ç¤¹¤¬¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òÆþÎϤ¹¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "¥ª¥×¥·¥ç¥ó¤Î¥³¥á¥ó¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4228,46 +4042,36 @@ msgstr ""
 "O  ¸°¤ÎÀ¸À®¤Î³¹Ô¡£\n"
 "Q  ¸°¤ÎÀ¸À®¤ÎÃæ»ß¡£"
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Éû¸°¤òÀ¸À®¤¹¤ë¾ì¹ç¡¢¡Öyes¡×(¤Þ¤¿¤Ï¡¢Ã±¤Ë¡Öy¡×) ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:162
+#: g10/helptext.c:156
 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\"."
@@ -4301,11 +4105,11 @@ msgstr ""
 "\n"
 "Àµ¤·¤¤Åú¤Î¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö0¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:194
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4313,11 +4117,11 @@ msgstr ""
 "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
 "¾ÚÌÀ½ñ¤âÁ´ÉôƱ»þ¤Ëºï½ü¤·¤Þ¤¹!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:203
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "¤³¤ÎÉû¸°¤òºï½ü¤¹¤ë¾ì¹ç¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:208
 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"
@@ -4327,7 +4131,7 @@ msgstr ""
 "¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Ï¡¢¸°¤Ø¤Î¿®ÍѤÎÎؤκîÀ®¤ä¡¢\n"
 "¤³¤Î¸°¤Ë¤è¤ë¾ÚÌÀ¤Ë¤È¤Ã¤Æ½ÅÍפÀ¤«¤é¤Ç¤¹¡£"
 
-#: g10/helptext.c:219
+#: g10/helptext.c:213
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4339,7 +4143,7 @@ msgstr ""
 "¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n"
 "¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£"
 
-#: g10/helptext.c:225
+#: g10/helptext.c:219
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4347,7 +4151,7 @@ msgstr ""
 "¤³¤Î½ð̾¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¤³¤È¤Ï¡¢¤¢¤Ê¤¿¤Î¸°Îؤ«¤éºï½ü¤¹¤Ù¤­¤À\n"
 "¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:223
 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"
@@ -4360,7 +4164,7 @@ msgstr ""
 "¤·¤ì¤Þ¤»¤ó¡£¤è¤Ã¤Æ¡¢¤³¤Î¼«¸Ê½ð̾¤¬²¿¤é¤«¤ÎÍýͳ¤Ë¤è¤ê̵¸ú¤Ç¤¢¤Ã¤Æ¡¢\n"
 "ÂåÂؤȤʤ븰¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß¡¢ºï½ü¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:237
+#: g10/helptext.c:231
 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"
@@ -4369,23 +4173,23 @@ msgstr ""
 "Á´Éô (¤Þ¤¿¤ÏÁªÂò¤·¤¿) ¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤ò¡¢¸½ºß¤ÎÁª¹¥°ìÍ÷¤ËÊѹ¹\n"
 "¤·¤Þ¤¹¡£´Ø·¸¤¹¤ë¼«¸Ê½ð̾¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï¡¢1É乤¹¤ß¤Þ¤¹¡£\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:238
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹ \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:244
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "ÆþÎϤ·¤¿¥Ñ¥¹¥Õ¥ì¡¼¥º¤Î³Îǧ¤Î¤¿¤á¡¢ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: g10/helptext.c:254
+#: g10/helptext.c:248
 msgid "Give the name of the file to which the signature applies"
 msgstr "½ð̾¤ò¹Ô¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:253
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "¾å½ñ¤­¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4393,7 +4197,7 @@ msgstr ""
 "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£Ã±¤Ë¥ê¥¿¡¼¥ó¡¦¥­¡¼¤ò²¡¤¹¤È¡¢\n"
 "(³ç¸Ì¤Ç°Ï¤ó¤À) ´ûÄê¤Î¥Õ¥¡¥¤¥ë̾¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
-#: g10/helptext.c:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4422,7 +4226,7 @@ msgstr ""
 "      ¤Þ¤¹¡£¤³¤ì¤ÏÉáÄÌ¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤¿¤È\n"
 "      ¤­¤Ë»È¤¤¤Þ¤¹¡£\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4432,11 +4236,11 @@ msgstr ""
 "¥­¥¹¥È¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Æ¥­¥¹¥È¤Ï´Ê·é¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "¶õ¹Ô¤Ç½ª¤ï¤ê¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s'¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó"
@@ -4498,273 +4302,3 @@ 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 "too many random bits requested; the limit is %d\n"
-#~ msgstr "¥é¥ó¥À¥à¡¦¥Ó¥Ã¥È¤ò¤¿¤¯¤µ¤óÍ׵ᤷ²á¤®¤Ç¤¹¡£¸Â³¦¤Ï %d\n"
-
-#~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[̾Á°]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯"
-
-#~ msgid "--delete-secret-key user-id"
-#~ msgstr "--delete-secret-key ¥æ¡¼¥¶¡¼id"
-
-#~ msgid "--delete-key user-id"
-#~ msgstr "--delete-key ¥æ¡¼¥¶¡¼id"
-
-#~ msgid "--delete-secret-and-public-key user-id"
-#~ msgstr "--delete-secret-and-public-key ¥æ¡¼¥¶¡¼id"
-
-#~ msgid "For info see http://www.gnupg.org"
-#~ msgstr "KUWASIKU WA http://www.gnupg.org/ WO GORANKUDASAI"
-
-#~ 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 ""
-#~ "¸°¤Ø¤ÎÍ­¸ú¤Ê¿®ÍѤηÐÏ©¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
-#~ "¤¤¤Ê¤¤¿Í¤Î¿®ÍÑÅÙ¤¬ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No path leading to one of our keys found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "¤³¤Á¤é¤Î¸°¤Ø»ê¤ë·ÐÏ©¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¤Î¾ÚÌÀ½ñ¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No trust values changed.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "¿®ÍÑÅÙ¤ÎÊѹ¹¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-#~ "\n"
-
-#~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr "%08lX: ¿®ÍÑÅÙ¤ò·×»»¤¹¤ë¾ðÊ󤬤¢¤ê¤Þ¤»¤ó\n"
-
-#~ msgid "Enter the user ID: "
-#~ msgstr "¥æ¡¼¥¶¡¼ID¤òÆþÎÏ: "
-
-#~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤ÇÀßÄêºÑ¤ß¤Ç¤¹\n"
-
-#~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: ¸°¤Î¸¡¾Ú¥¨¥é¡¼: %s\n"
-
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "ËÜÅö¤Ë½ð̾¤È°Å¹æÍѤθ°¤òºî¤ê¤Þ¤¹¤«? "
-
-#~ msgid "Do you really need such a large keysize? "
-#~ msgstr "¤³¤ó¤Ê¤ËŤ¤¸°¤¬ËÜÅö¤Ë¤¤¤ê¤Þ¤¹¤«? "
-
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "¾ÚÌÀ½ñ¤ÎÆɹþ¤ß¾ã³²: %s\n"
-
-#~ msgid "too many entries in unk cache - disabled\n"
-#~ msgstr "unk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n"
-
-#~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
-#~ msgstr "ÈëÌ©¸°%08lX¤ÏÆɤ߹þ¤Þ¤ì¤Þ¤»¤ó (Í­¸ú¤Ë¤¹¤ë¤Ë¤Ï%s¤ò»È¤¤¤Þ¤¹)\n"
-
-#~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤Ë¤Ï¼«¸Ê½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
-
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-
-#~ msgid "update of trustdb failed: %s\n"
-#~ msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr ""
-#~ "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤Ï¤¢¤ê¤Þ¤»¤ó (--keyserver¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦)\n"
-
-#~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: Àµ¤·¤¤¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n"
-
-#~ msgid "assuming bad MDC due to an unknown critical bit\n"
-#~ msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢ÉÔÀµ¤ÊMDC¤È¤ß¤Ê¤·¤Þ¤¹\n"
-
-#~ msgid "error reading dir record for LID %lu: %s\n"
-#~ msgstr "LID %lu¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
-
-#~ msgid "lid %lu: expected dir record, got type %d\n"
-#~ msgstr "lid %lu: ´üÂÔ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¡¢¥¿¥¤¥×%d\n"
-
-#~ msgid "no primary key for LID %lu\n"
-#~ msgstr "LID %lu¤Î¼ç¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
-
-#~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr "LID %lu¤Î¼ç¸°¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
-
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "key %08lX: query record failed\n"
-#~ msgstr "¸°%08lX: ¥ì¥³¡¼¥É¤ÎÌä¹ç¤»¤Ë¼ºÇÔ\n"
-
-#~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "¸°%08lX: ´û¤Ë¿®ÍѤ¹¤ë¸°¤Îɽ¤Ë¤¢¤ê¤Þ¤¹\n"
-
-#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤ÏÊݸ¤ì¤Æ¤¤¤Þ ¤»¤ó¡£\n"
-
-#~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "¸°%08lX: ÈëÌ©¸°¤È¸ø³«¸°¤¬Âбþ¤·¤Æ¤¤¤Þ¤»¤ó\n"
-
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "ÈëÌ©¸°¤ÎÎóµó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n"
-
-#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "¸°%08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇË´þ\n"
-
-#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "¸°%08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid subkey revocation\n"
-#~ msgstr "¸°%08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n"
-
-#~ msgid "Good self-signature"
-#~ msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾"
-
-#~ msgid "Invalid self-signature"
-#~ msgstr "̵¸ú¤Ê¼«¸Ê½ð̾"
-
-#~ msgid "Valid user ID revocation skipped due to a newer self signature"
-#~ msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó"
-
-#~ msgid "Valid user ID revocation"
-#~ msgstr "Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
-
-#~ msgid "Invalid user ID revocation"
-#~ msgstr "̵¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ"
-
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
-
-#~ msgid "Good certificate"
-#~ msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ"
-
-#~ msgid "Invalid certificate revocation"
-#~ msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
-
-#~ msgid "Invalid certificate"
-#~ msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ"
-
-#~ msgid "sig record %lu[%d] points to wrong record.\n"
-#~ msgstr "½ð̾¥ì¥³¡¼¥É%lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n"
-
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü"
-
-#~ msgid "tdbio_search_dir failed: %s\n"
-#~ msgstr "tdbio_search_dir ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "lid %lu: inserted\n"
-#~ msgstr "lid %lu: ÁÞÆþ¤·¤Þ¤·¤¿\n"
-
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
-
-#~ msgid "\t%lu keys with errors\n"
-#~ msgstr "\t%lu¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
-
-#~ msgid "\t%lu keys inserted\n"
-#~ msgstr "\t%lu¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n"
-
-#~ msgid "lid %lu: dir record w/o key - skipped\n"
-#~ msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n"
-
-#~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "\t%lu¿·¤·¤¤¸ø³«¸°\n"
-
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n"
-
-#~ msgid "\t%lu keys updated\n"
-#~ msgstr "\t%lu¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n"
-
-#~ msgid "Ooops, no keys\n"
-#~ msgstr "¤ª¤Ã¤È¡¢¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
-
-#~ msgid "Ooops, no user IDs\n"
-#~ msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n"
-
-#~ msgid "check_trust: search dir record failed: %s\n"
-#~ msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "key %08lX: insert trust record failed: %s\n"
-#~ msgstr "¸°%08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "¸°%08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n"
-
-#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
-#~ msgstr "¸°%08lX.%lu: ̤Íè¤Ë¤Ç¤­¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
-
-#~ msgid "key %08lX.%lu: expired at %s\n"
-#~ msgstr "¸°%08lX.%lu: %s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
-
-#~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "¸°%08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é'%s'¤Î¸¡º÷¤Ë¾ã³²: %s\n"
-
-#~ msgid "user '%s' not in trustdb - inserting\n"
-#~ msgstr "¥æ¡¼¥¶¡¼'%s'¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ\n"
-
-#~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr "'%s'¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr "·Ù¹ð: ¤Þ¤À long pref ¥ì¥³¡¼¥É¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n"
-
-#~ msgid "%s: can't create keyring: %s\n"
-#~ msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤»¤ó: %s\n"
diff --git a/po/nl.po b/po/nl.po
index b30d53c9e..1f4d6e7bd 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-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\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 "Let op: er wordt onveilig geheugen gebruikt!\n"
 
 #: util/secmem.c:89
@@ -45,7 +46,7 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "einde"
 
@@ -273,58 +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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
-msgstr ""
+#: cipher/random.c:369
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: cipher/random.c:348
+#: cipher/random.c:377
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:692
 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 ""
 "Gebruik geen enkele gegevens die door dit programma gegenereerd zijn!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +352,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -358,170 +360,170 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -531,205 +533,205 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -749,17 +751,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <gnupg-bugs@gnu.org>;\n"
 "fouten in de vertaling aan <nl@li.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -769,7 +771,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -777,259 +779,279 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\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 "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "LET OP: `%s' is een leeg bestand\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "ongeldige versleuteling"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "LET OP: `%s' is een leeg bestand\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "ongeldige sleutelbos"
+
+#: 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 "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: 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 "LET OP: %s is niet voor gewoon gebruik!\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 is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %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 ""
 
-#: 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 ""
 
-#: g10/g10.c:1531
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\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 "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 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 moet tussen de 1 en de 255 (inclusief) liggen\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %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 [bestandsnaam]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: 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 "kan %s niet openen: %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] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\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 "kan `%s' niet openen\n"
 
-#: g10/g10.c:2474
+#: g10/g10.c:2509
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1038,16 +1060,16 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
@@ -1504,7 +1526,7 @@ msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
@@ -1512,7 +1534,7 @@ msgstr "Uw keuze? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
@@ -1752,7 +1774,7 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:784 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
@@ -1848,7 +1870,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %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"
@@ -1856,7 +1878,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\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"
@@ -1872,86 +1894,86 @@ msgstr ""
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: 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 ""
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:132 g10/encode.c:357
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu sleutels verwerkt\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: kon niet openen: %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 "fout tijdens aanmake sleuteltekst: %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: LET OP: leeg bestand\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 ""
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%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 ""
 
-#: 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 "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %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
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:81 g10/export.c:213
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets geëxporteerd\n"
 
@@ -1982,261 +2004,266 @@ msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 "sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu sleutels zijn tot nu toe behandeld\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totaal aantal behandeld: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          zonder identificatie: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "geïmporteerd: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "onveranderd: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nieuwe gebruikers: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nieuwe ondertekeningen: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime sleutels geïmporteerd: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\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 "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:544
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
+
+#: g10/import.c:663
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\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 "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %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 "schrijven naar `%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 "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "sleutel %08lX: openbare sleutel geïmporteerd\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\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 "sleutel %08lX: kan originele sleutelblok niet vinden: %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 "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:781
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "sleutel %08lX: geheime sleutel geïmporteerd\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 "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %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 ""
 "sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat geïmporteerd\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\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 "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -2245,206 +2272,213 @@ msgstr "sleutel %08lX: subsleutel overgeslagen\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 ""
 "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
 "overgeslagen\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
 "overgeslagen\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr ""
+"sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
+"overgeslagen\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\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 "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[terugtrekking]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 ongeldige ondertekening\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 ongeldige ondertekeningen\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 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\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 ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\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 ondertekening niet gecontroleerd wegens een fout\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 ondertekeningen niet gecontroleerd wegens fouten\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "%d gebruikersidentificaties gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Sleutel is beveiligd.\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 "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: 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 "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/keyedit.c:395
+#: 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:404
+#: 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:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:531
+#: 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:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:556
+#: 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:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2452,7 +2486,7 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
@@ -2460,25 +2494,25 @@ msgid ""
 msgstr ""
 "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\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 ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\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 ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, fuzzy
 msgid ""
 "\n"
@@ -2487,7 +2521,7 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 #, fuzzy
 msgid ""
 "\n"
@@ -2496,52 +2530,52 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: 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 "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2549,7 +2583,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\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"
@@ -2557,591 +2591,591 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "beëindig dit menu"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "opslaan en beëindigen"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "nrlsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 #, fuzzy
 msgid "add a photo ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "revkey"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "set preference list"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updated preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr ""
 
-#: 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 "kan dat niet doen in lopende band-modus\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: 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 "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: 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 "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Beëindigen zonder te bewaren? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr ""
 
-#: 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 ""
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subsleutel is teruggeroepen: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: 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"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geef de sleutelgrootte"
 
-#: 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 "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal één secundaire sleutel.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\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 "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3150,7 +3184,7 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3159,59 +3193,59 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   getekend door %08lX op %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 "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\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 ""
@@ -3226,7 +3260,7 @@ msgstr "%s ondertekening van: %s\n"
 msgid "Signature policy: "
 msgstr "%s ondertekening van: %s\n"
 
-#: 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 "LET OP: ongeldige aantekeningen gevonden\n"
 
@@ -3249,162 +3283,171 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Vingerafdruk:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "sleutels en vingerafdrukken opnoemen"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "            Vingerafdruk:"
 
-#. 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:"
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
 msgstr "            Vingerafdruk:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "            Vingerafdruk:"
+
+#: g10/keylist.c:1010
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "            Vingerafdruk:"
 
-#: 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 versleutelde gegevens\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 "versleuteld met onbekend algoritme %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede 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 "versleuteld met %u-bit %s sleutel, nummer %08lX, gemaakt op %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s versleutelde gegevens\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\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
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %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
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
@@ -3424,12 +3467,12 @@ msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
 #: g10/misc.c:386
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:418
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:443
@@ -3491,7 +3534,7 @@ msgstr ""
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\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 "kan geen verbinding maken met `%s': %s\n"
@@ -3640,42 +3683,41 @@ msgstr "LET OP: geheime sleutel %08lX is vervallen op %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "sleutel %08lx: sleutel is teruggeroepen!\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
+#: g10/hkp.c:71
 #, fuzzy, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+msgid "requesting key %08lX from %s\n"
 msgstr "opvragen van sleutel %08lX van %s ...\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan de sleutel niet opvragen van de server: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fout bij versturen naar `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "versturen naar `%s' gelukt (status=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%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 ""
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kan de sleutel niet opvragen van de server: %s\n"
@@ -3710,29 +3752,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 ""
 "dit is een ElGamal sleutel van PGP, die NIET veilig is voor "
 "ondertekeningen!\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 "openbare sleutel is %lu seconde nieuwer dan de ondertekening\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 "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
@@ -4122,33 +4164,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 "kan dat niet doen in lopende band-mode zonder \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Deze sleutel van de sleutelbos verwijderen? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Dit is een geheime sleutel! - echt verwijderen? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "nummeren van de sleutelblokken mislukte: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
@@ -4524,6 +4570,12 @@ msgstr "sleutels en ondertekeningen opnoemen"
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Vingerafdruk:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "            Vingerafdruk:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
diff --git a/po/pl.po b/po/pl.po
index 6546ed49d..3cf393410 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-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 2002-04-28 02:44+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -24,7 +24,8 @@ msgstr ""
 "enc.c\n"
 
 #: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
 msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n"
 
 #: util/secmem.c:89
@@ -55,7 +56,7 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "wyj¶cie"
 
@@ -282,61 +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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo¿na sprawdziæ %s: %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, 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:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:369
+#, 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:348
+#: cipher/random.c:377
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo¿na odczytaæ %s: %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo¿na stworzyæ %s: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo¿na zapisaæ %s: %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo¿na zamkn±æ %s: %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 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:663
+#: cipher/random.c:692
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -350,7 +352,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ¡ SIÊ DO \n"
 "NORMALNEGO U¯YTKU I NIE ZAPEWNIAJ¡ BEZPIECZEÑSTWA!!\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -362,7 +364,7 @@ msgstr ""
 "Proszê kontynuowaæ inne dzia³ania aby system móg³ zebraæ odpowiedni±\n"
 "ilo¶æ entropii do ich wygenerowania (brakuje %d bajtów).\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -370,167 +372,167 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z³o¿enie podpisu"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "z³o¿enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[pliki]|szyfrowanie plików"
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "tylko zapis danych w formacie OpenPGP"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy¶lnie)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[pliki]|odszyfrowywanie plików"
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "sprawdzenie podpisów kluczy"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "z³o¿enie prywatnego podpisu na kluczu"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr ""
 "z³o¿enie na kluczu podpisu nie podlegaj±cego \n"
 "uniewa¿nieniu"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "z³o¿enie na kluczu podpisu prywatnego,\n"
 "nie podlegaj±cego uniewa¿nieniu"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa¿nienia klucza"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "od¶wie¿enie kluczy z serwera"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "import/do³±czenie kluczy"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakietów"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "eksport warto¶ci zaufania"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "wczytanie warto¶æi zaufania"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "automatyczne uaktualnienie bazy zaufania"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "zdjêcie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skróty wiadomo¶ci"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -540,192 +542,192 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego adresata"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "domy¶lny klucz jest domy¶lnym adresatem"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "plik wyj¶ciowy"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatóww"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "bez odwo³añ do terminala"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "bez wymuszania trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "wymuszenie czwartej wersji formatu podpisów"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "bez wymuszania czwartej wersji formatu podpisów"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania bêdzie u¿ywany MDC"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "do szyfrowania nie zostanie u¿yty MDC"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "wykorzystanie gpg-agenta"
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: ¿adnych pytañ"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "dodaæ zbiór kluczy do listy u¿ywanych"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "dodaæ zbiór kluczy tajnych do listy"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "okazanie, w którym zbiorze kluczy znajduje siê dany klucz"
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znaków terminala NAZWA"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisaæ opis stanu do FD"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[plik]|zapisaæ opis stanu do pliku"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLUCZ|klucz ca³kowicie zaufany"
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "tryb zgodno¶ci formatu pakietów, szyfrów i skrótów z OpenPGP"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "tryb zgodno¶ci formatów, szyfrów i skrótów z PGP 2.x"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb obliczania has³a"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm skrótu dla has³a ALG"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj±cy ALG dla has³a"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj±cy NAZWA"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "usuniêcie numerów kluczy adresatów z zaszyfrowanych pakietów"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "okazanie identyfikatora - zdjêcia u¿ytkownika"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "bez pokazywania zdjêæ"
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "polecenie wywo³ania przegl±darki do zdjêæ"
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -733,7 +735,7 @@ msgstr ""
 "@\n"
 "(Pe³n± listê poleceñ i opcji mo¿na znale¼æ w podrêczniku systemowym.)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -754,15 +756,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -772,7 +774,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
 "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -780,258 +782,278 @@ msgstr ""
 "\n"
 "Obs³ugiwane algorytmy:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "wywo³anie: gpg [opcje]"
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\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 "UWAGA: brak domy¶lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn± nazw± zestawu znaków\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "niezrozuma³y URI serwera kluczy\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "OSTRZE¯ENIE: '%s' jest przestarza³± opcj±.\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "b³±d w opakowaniu ASCII."
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "OSTRZE¯ENIE: '%s' jest przestarza³± opcj±.\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "b³±d w zbiorze kluczy"
+
+#: g10/g10.c:1369
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n"
 
-#: g10/g10.c:1476
+#: g10/g10.c:1506
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %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 "UWAGA: %s nie jest do normalnego u¿ytku!\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 "Nie wolno u¿ywaæ %s z %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %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 ""
 "w trybie --pgp2 mo¿na sk³adaæ tylko podpisy oddzielne lub do³±czone do "
 "tekstu\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 "w trybie --pgp2 nie mo¿na jednocze¶nie szyfrowaæ i podpisywaæ\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 "w trybie --pgp2 trzeba u¿ywaæ plików a nie potoków.\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo¶ci w trybie --pgp2 wymaga modu³u szyfru 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 "tej wiadomo¶ci mo¿e nie daæ siê odczytaæ za pomoc± 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 "wybrany algorytm szyfruj±cy jest niepoprawny\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 "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodziæ z zakresu %d..%d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew³a¶ciwy domy¶lny poziom sprawdzania; musi mieæ warto¶æ 0, 1 lub 3\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "niew³a¶ciwe ustawienia\n"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "niew³a¶ciwe ustawienia\n"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "niew³a¶ciwe ustawienia\n"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "niew³a¶ciwe ustawienia\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %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 [plik]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u¿ytkownika [polecenia]"
 
-#: 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 "nie mo¿na otworzyæ %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] [identyfikator] [zbiór kluczy]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\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 "nie mo¿na otworzyæ ,%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 "
@@ -1040,15 +1062,15 @@ msgstr ""
 "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki,\n"
 "podkre¶lenia, i musi koñczyæ siê ,='\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu certyfikacji jest niepoprawny\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
@@ -1479,7 +1501,7 @@ msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
@@ -1487,7 +1509,7 @@ msgstr "Twój wybór? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "U¿ywanie tego algorytmu jest odradzane - tworzyæ mimo to? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Niew³a¶ciwy wybór.\n"
 
@@ -1728,7 +1750,7 @@ msgid ""
 msgstr ""
 "Musisz podaæ d³ugie, skomplikowane has³o aby ochroniæ swój klucz tajny.\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 "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba"
 
@@ -1822,7 +1844,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod³a siê: %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"
@@ -1830,7 +1852,7 @@ msgstr ""
 "klucz zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\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"
@@ -1847,88 +1869,88 @@ msgstr ""
 msgid "Really create? "
 msgstr "Na pewno utworzyæ? "
 
-#: 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 "opcja --output nie dzia³a z tym poleceniem\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' ju¿ jest spakowany\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: nie mo¿na otworzyæ: %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 "b³±d podczas tworzenia has³a: %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: OSTRZE¯ENIE: plik jest pusty\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 ""
 "w trybie --pgp2 mo¿na szyfrowaæ dla kluczy RSA krótszych od 2048 bitów\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%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 ""
 "nie mo¿na u¿yæ szyfru IDEA z wszystkimi kluczami dla których szyfrujesz.\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 "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %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 "klucz `%s' nie zosta³ odaleziony: %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 "b³±d odczytu bloku kluczy: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pominiêty\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pominiêty\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pominiêty\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n"
 
@@ -1959,260 +1981,265 @@ msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n"
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominiêty\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pominiêty\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b³±d odczytu '%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Ogó³em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pominiêtych nowych kluczy: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do³±czono do zbioru: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikatorów: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpisów: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa¿nieñ kluczy: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\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 "klucz %08lX: brak identyfikatora u¿ytkownika\n"
 
-#: g10/import.c:544
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "klucz %08lX: brak podklucza do dowi±zania\n"
+
+#: g10/import.c:663
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "klucz %08lX: przyjêto identyfikator nie podpisany nim samym '%s'\n"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikatorów u¿ytkownika\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo¿e byæ spowodowane brakiem podpisu w³a¶ciciela klucza\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 "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pominiêty\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %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 "zapis do '%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 "b³±d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza siê z lokalnie posiadan± kopi±\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 "klucz %08lX: brak oryginalnego bloku klucza; %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 "klucz %08lX: nie mo¿na odczytaæ oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u¿ytkownika\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: %d nowych identyfikatorów u¿ytkownika\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpisów\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy¶lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\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 "Klucz %08lX: ten klucz ju¿ znajduje siê w zbiorze\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %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 ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniwa¿nienia nie mo¿e byæ zastosowany\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - odrzucony\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa¿nienia\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n"
 
-#: g10/import.c:941
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "klucz %08lX: algorytm klucza publicznego \"%s\" nie jest obs³ugiwany\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi±zania\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 "klucz %08lX: nie obs³ugiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pominiêto identyfikator u¿ytkownika '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pominiêty\n"
@@ -2221,116 +2248,123 @@ msgstr "klucz %08lX: podklucz pominiêty\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 "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominiêty\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa¿nienia umieszczony w niew³a¶ciwym \n"
 "miejscu - zosta³ pominiêty\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - pominiêty\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr ""
+"klucz %08lX: certyfikat uniewa¿nienia umieszczony w niew³a¶ciwym \n"
+"miejscu - zosta³ pominiêty\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: powtórzony identyfikator u¿ytkownika - do³±czony\n"
 
-#: g10/import.c:1233
-#, 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 ""
 "Ostrze¿enie: klucz %08lX móg³ zostaæ uniewazniony:\n"
 "             zapytanie o uniewa¿niaj±cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1247
-#, 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 ""
 "Ostrze¿enie: klucz %08lX móg³ zostaæ uniewa¿niony:\n"
 "             brak uniewa¿niaj±cego klucza %08lX.\n"
 
-#: g10/import.c:1304
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa¿nienia\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo¶redni podpis\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[uniewa¿nienie]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\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 niepoprawnych podpisów\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 podpis nie zosta³ sprawdzony z powodu braku klucza\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 podpisów nie zosta³o sprawdzonych z powodu braku kluczy\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 podpis nie zosta³ sprawdzony z powodu b³êdu\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 podpisów nie sprawdzonych z powodu b³êdów\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u¿ytkownika bez podpisu w³a¶ciciela klucza\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikatorów u¿ytkownika bez podpisów w³a¶ciciela klucza\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u¿ytkownika \"%s\" zosta³ uniewa¿niony."
 
-#: 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
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisaæ? (t/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 " Nie da siê z³o¿yæ podpisu.\n"
 
-#: 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 "OSTRZE¯ENIE: plik '%s' jest pusty\n"
 
-#: g10/keyedit.c:395
+#: g10/keyedit.c:396
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2339,7 +2373,7 @@ msgstr ""
 "Twój podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\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 ""
@@ -2347,7 +2381,7 @@ msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2356,51 +2390,51 @@ msgstr ""
 "Twój podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieniæ go na pe³ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" jest ju¿ lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" jest ju¿ podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Data wa¿no¶ci tego klucza up³ynê³a!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa¿no¶æ tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz ¿eby wa¿no¶æ Twojego podpisu wygasa³a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:532
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "W trybie --pgp2 nie mo¿na podpisywaæ w formacie OpenPGP.\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla 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"
@@ -2409,27 +2443,27 @@ msgstr ""
 "Jak dok³adnie zosta³a przez Ciebie sprawdzona to¿samo¶æ tej osoby?\n"
 "Je¶li nie wiesz co odpowiedzieæ, podaj \"0\".\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W ogóle nie.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie¿nie.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok³adnie.%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: \""
@@ -2437,32 +2471,32 @@ msgstr ""
 "Czy jeste¶ naprawdê pewien ¿e chcesz podpisaæ ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "to mo¿e byæ spowodowane brakiem podpisu w³a¶ciciela klucza\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"
 "Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\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"
 "Podpis zostanie oznaczony jako nie podlegaj±cy uniewa¿nieniu.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2470,7 +2504,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2478,7 +2512,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj±cy uniewa¿nieniu.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2486,7 +2520,7 @@ msgstr ""
 "\n"
 "To¿samo¶æ u¿ytkownika nie zosta³a w ogóle sprawdzona.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2494,7 +2528,7 @@ msgstr ""
 "\n"
 "To¿samo¶æ u¿ytkownika zosta³a sprawdzona pobie¿nie.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2502,33 +2536,33 @@ msgstr ""
 "\n"
 "To¿samo¶æ u¿ytkownika zosta³a dok³adnie sprawdzona.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Czy na pewno podpisaæ? "
 
-#: 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 "z³o¿enie podpisu nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Czê¶æ tajna g³ównego klucza jest niedostêpna.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo¿na edytowaæ: %s.\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2536,7 +2570,7 @@ msgstr ""
 "Wprowad¼ nowe d³ugie has³o dla tego klucza tajnego.\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"
@@ -2544,461 +2578,461 @@ msgstr ""
 "Nie chcesz has³a - to *z³y* pomys³!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobiæ? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "przenoszê podpis klucza na w³a¶ciwe miejsce\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "wyj¶cie z tego menu"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "zapis zmian i wyj¶cie"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikatorów u¿ytkowników"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:905
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:906
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:906
 msgid "select user ID N"
 msgstr "wybór identyfikatora u¿ytkownika N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "wybór podklucza N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "lista podpisów"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "z³o¿enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nupodpis"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "z³o¿enie na kluczu podpisu nie podlegaj±cego uniewa¿nieniu"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nulpodpis"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "z³o¿enie na kluczu lokalnego podpisu nie podlegaj±cego uniewa¿nieniu"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "¶ledzenia"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "dodfoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "dodanie zdjêcia u¿ytkownika do klucza"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "usuniêcie identyfikatora u¿ytkownika z klucza"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "usfoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "usuniêcie podklucza"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "uniewa¿niony"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "usuniêcie podpisów"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "zmiana daty wa¿no¶ci klucza"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "g³ówny"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "oznaczenie identyfikatora u¿ytkownika jako g³ównego"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "prze³"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "opcje"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawieñ"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "ustaw"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "aktopc"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "aktualizacja ustawieñ klucza"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "has³o"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "zmiana has³a klucza"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w³a¶ciciela"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "uniewa¿nienie podpisu"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "uniewa¿nienie podklucza"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "wy³kl"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "wy³±czyæ klucz z u¿ycia"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "w³kl"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "w³±czyæ klucz do u¿ycia"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "foto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "okazanie identyfikatora - zdjêcia"
 
-#: 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 "nie dzia³a w trybie wsadowym\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "b³±d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Dostêpny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u¿yæ polecenia \"prze³\".\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 msgid "Key is revoked."
 msgstr "Klucz uniewa¿niony."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dostêpne w trybie %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 "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? "
 
-#: 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 "Musisz wybraæ co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun±æ wybrane klucze? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun±æ ten klucz? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Czy na pewno zaktualizowaæ ustawienia klucza dla wybranych identyfikatorów? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Czy na pewno usaktualniæ ustawienia? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Zapisaæ zmiany? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Wyj¶æ bez zapisania zmian? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod³o siê: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta³ zmieniony wiêc naniesienie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spróbuj \"help\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Klucz mo¿e zostaæ uniewa¿niony przez klucz %s %s%s.\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (poufne)"
 
-#: 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  utworzony: %s, wa¿ny do: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta³ wy³±czony z u¿ytku"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "podklucz zosta³ uniewa¿niony: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "fa³szywy certyfikat uniewa¿nienia\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "problem przy sprawdzaniu uniewa¿nienia: %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
 #, fuzzy
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
@@ -3008,7 +3042,7 @@ msgstr ""
 "nie\n"
 "zostanie uruchomiony ponownie.\n"
 
-#: 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"
@@ -3018,108 +3052,108 @@ msgstr ""
 "niektóre \n"
 "             wersje przestan± go rozumieæ.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je dodaæ? (t/N) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla wersji 2 PGP nie mo¿na dodaæ zdjêcia.\n"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun±æ ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun±æ ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuniêty.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpisów usuniêtych.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta³o usuniête.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Wprowad¼ rozmiar klucza"
 
-#: 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 "Proszê usun±æ znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Proszê wybraæ tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa¿no¶ci podklucza.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo¿na zmieniæ daty wa¿no¶ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\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 "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "Identyfikator u¿ytkownika: "
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3128,7 +3162,7 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, c-format
 msgid ""
 "\"\n"
@@ -3137,56 +3171,56 @@ msgstr ""
 "\"\n"
 "lokalnie podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory u¿ytkowników s± podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa¿niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "podpisany przez %08lX w %s%s\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2944
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2951
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) "
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\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 "Zdjêcie w formacie %s, rozmiar %ld bajtów, klucz 0x%08lX (id %d).\n"
@@ -3200,7 +3234,7 @@ msgstr "Regulamin podpisu: "
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: 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 "OSTRZE¯ENIE: niepoprawne dane w adnotacji\n"
 
@@ -3222,158 +3256,167 @@ msgid "Keyring"
 msgstr "Zbiór kluczy"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Odcisk klucza:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "lista kluczy i ich odcisków"
 
-#. 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 "                  Odcisk:"
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "     Odcisk klucza ="
+
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "     Odcisk klucza ="
+
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: 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 "dane zaszyfrowano za pomoc± %s\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 "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "Zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania kluczem publicznym: %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 "przyjmuj±c ¿e dane zosta³y zaszyfrowane za pomoc± %s\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dostêpny, %s zostanie wykorzystany zamiast niego\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE¯ENIE: zaszyfrowana wiadomo¶æ by³a manipulowana!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy³ ¿e wiadomo¶æ nie powinna byæ zapisywana\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa¿nienia - u¿yj ,,gpg --import'' aby go przyj±æ\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Adnotacja: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Regulamin: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominiêcie sprawdzenia podpisu\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 "nie mo¿na obs³uzyæ tych wielokrotnych podpisów\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Przeterminowany podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Poprawny podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo¿na sprawdziæ podpisu: %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 "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -3392,13 +3435,13 @@ msgstr ""
 "u¿ywanie tego szyfru jest odradzane; nale¿y u¿ywaæ standardowych szyfrów!\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 "Ostrze¿enie: niebezpieczne prawa w³asno¶ci do %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 "Ostrze¿enie: niebezpieczne prawa dostêpu do %s \"%s\".\n"
 
 #: g10/misc.c:443
@@ -3460,7 +3503,7 @@ msgstr "z³y format zmiennej GPG_AGENT_INFO\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko³u agenta nie jest obs³ugiwana\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 "nie mo¿na siê po³±czyæ z ,,%s'': %s\n"
@@ -3605,42 +3648,41 @@ msgstr "UWAGA: wa¿no¶æ klucza tajnego %08lX wygas³a %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "klucz %08lX: klucz zosta³ uniewa¿niony!\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 "zapytanie o klucz %08lX w serwerze HKP %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "nie mo¿na pobraæ klucza z serwera: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "b³±d przy wysy³aniu do '%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "wysy³anie do '%s' powiod³o siê (status=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "wysy³anie do '%s' nie powiod³o siê (status=%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 "zapytanie o \"%s\" w serwerze HKP %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "nie mo¿na przeszukaæ serwera: %s\n"
@@ -3673,29 +3715,29 @@ msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "tworzenie przestarza³ej 16-bitowej sumy kontrolnej dla ochrony klucza\n"
 
-#: 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 ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk³adane\n"
 "nie zapewniaj± bezpieczeñstwa!\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 "klucz publiczny jest o %lu sekund m³odszy od podpisu\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 "klucz publiczny jest o %lu sekund m³odszy od podpisu\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "UWAGA: klucz podpisuj±cy %08lX przekroczy³ datê wa¿no¶ci %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyjêto niewa¿no¶æ podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
@@ -4084,33 +4126,37 @@ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 "Algorytm DSA wymaga u¿ycia algorytmu skrótu daj±cego 160-bitowy wynik.\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 "bez opcji \"--yes\" nie dzia³a w trybie wsadowym\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Usun±æ ten klucz ze zbioru? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "To jest klucz tajny! - czy na pewno go usun±æ? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "usuniêcie bloku klucza nie powiod³o siê: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr "informacja o zaufaniu dla w³a¶ciciela klucza zosta³a wymazana\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "dla klucza publicznegi ,,%s'' jest klucz tajny!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun±æ nalezy najpierw u¿yæ opcji \"--delete-secret-key\".\n"
 
@@ -4529,6 +4575,12 @@ msgstr "%lu kluczy (%lu podpisów)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Odcisk klucza:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "                  Odcisk:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NAZWA=TRE¦Æ|adnotacje"
 
diff --git a/po/pt.po b/po/pt.po
index b45532ee4..292c8e8b7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 2002-03-05 16:05+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\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 "Aviso: a utilizar memória insegura!\n"
 
 #: util/secmem.c:89
@@ -48,7 +49,7 @@ msgstr "não"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "sair"
 
@@ -275,59 +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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossível 'stat' a `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' não é um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed está vazia\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:369
+#, 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:348
+#: cipher/random.c:377
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossível ler `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed não actualizado\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossível escrever `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:692
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -341,7 +343,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +354,7 @@ msgstr ""
 "Não há bytes aleatórios suficientes. Por favor, faça outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (São necessários mais %d bytes)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +362,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra simétrica"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "decifrar dados (acção por omissão)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[ficheiros]|decifrar ficheiros"
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves público"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave de forma não revocável"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente e de forma não revocável"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequências de pacotes"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "actualizar automaticamente a base de dados de confiança"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confiança"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,210 +528,210 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omissão como destinatário por omissão"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "do not force v3 signatures"
 msgstr "não forçar assinaturas v3"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "force v4 key signatures"
 msgstr "forçar assinaturas v4"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 msgid "do not force v4 key signatures"
 msgstr "não forçar assinaturas v4"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 msgid "never use a MDC for encryption"
 msgstr "nunca usar um MDC para cifrar"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "utilizar o gpg-agent"
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto à lista"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "ler opções do ficheiro"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 msgid "|[file]|write status info to file"
 msgstr "|[ficheiro]|escrever ifnroamções de estado para o ficheiro"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|confiar totalmente nesta chave"
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opções de pacote, cifragem e \"digest\"\n"
 "para comportamento OpenPGP"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "configurar todas as opções de pacote, cifragem e \"digest\"\n"
 "para comportamento PGP 2.x"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes cifrados"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr "Mostrar IDs Fotográficos"
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr "Não mostrar IDs Fotográficos"
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr "Configurar linha de comandos para ver fotografias"
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -737,7 +739,7 @@ msgstr ""
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -757,15 +759,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -775,7 +777,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -783,256 +785,276 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\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 "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opções `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "AVISO: `%s' é um ficheiro vazio\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 "AVISO: `%s' é um ficheiro vazio\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "porta-chaves inválido"
+
+#: 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 "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %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 "NOTA: %s não é para uso normal!\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 não é permitido com %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %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 "só pode fazer assinaturas separadas ou em texto puro no modo --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 "não pode assinar e cifrar ao mesmo tempo no modo --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 ""
 "deve utilizar ficheiros (e não um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra 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 "esta mensagem poderá não ser utilizável pelo 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 "o algoritmo de cifragem selecionado não é válido\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 "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 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 deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "preferências inválidas\n"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências inválidas\n"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "preferências inválidas\n"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "preferências inválidas\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %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 [nome_do_ficheiro]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: 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 "impossível abrir %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] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\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 "impossível abrir `%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 "
@@ -1041,15 +1063,15 @@ msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de política de certificação dada é inválida\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
@@ -1483,7 +1505,7 @@ msgstr "   (%d) RSA (apenas cifragem)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Opção? "
 
@@ -1491,7 +1513,7 @@ msgstr "Opção? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "A utilização destes algoritmos está desactualizada - criar na mesma?"
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
@@ -1729,7 +1751,7 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger a sua chave.\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 "a frase secreta não foi repetida corretamente; tente outra vez"
 
@@ -1821,7 +1843,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %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"
@@ -1829,7 +1851,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\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"
@@ -1845,88 +1867,88 @@ msgstr "NOTA: a criação de sub-chave para chaves v3 não respeito o OpenPGP\n"
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: 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 não funciona para este comando\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' já comprimido\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: impossível abrir: %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 "erro na criação da frase secreta: %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: AVISO: ficheiro vazio\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 "no modo --pgp2 só pode cifrar com chaves RSA de 2048 bits ou menos\n"
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%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 ""
 "impossível utilizar a cifra IDEA para todas as chaves para que está a "
 "cifrar.\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 "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
 
-#: g10/encode.c:646
+#: 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/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 "chave `%s' não encontrada: %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 "erro na leitura do bloco de chave: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: não está protegida - ignorada\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1955,259 +1977,264 @@ msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             não modificados: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogações 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 não modificadas: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\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 "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:544
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "chave %08lX: sem subchave para ligação de chaves\n"
+
+#: g10/import.c:663
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\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 "chave %08lX: chave pública não encontrada: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "não foi encontrada nenhum porta-chaves onde escrever: %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 "a escrever para `%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 "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:596
+#: 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:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\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 "chave %08lX: impossível localizar bloco de chaves original: %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 "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de utilizador\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de utilizadores\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: não modificada\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves público por omissão: %s\n"
 
-#: g10/import.c:781
+#: 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:785
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no porta-chaves secreto\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta não encontrada: %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 ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogação\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogação importado\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\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 "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -2216,109 +2243,114 @@ msgstr "chave %08lX: subchave 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:1047
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\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 "chave %08lX: certificado de revogação adicionado\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revogação]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\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 assinaturas incorrectas\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 assinatura não verificada por falta de chave\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 assinaturas não verificadas por falta de chaves\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 assinatura não verificada devido a um erro\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 assinaturas não verificadas devido a erros\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura válida detectado\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas válidas detectados\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identificador do utilizador \"%s\" está revocado.\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
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (y/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 "AVISO: `%s' é um ficheiro vazio\n"
 
-#: g10/keyedit.c:395
+#: g10/keyedit.c:396
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2327,14 +2359,14 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "é uma assinatura local.\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 "Quer promovê-la a uma assinatura exportável? "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2343,51 +2375,51 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "é uma assinatura local.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promovê-la a uma assinatura exportável? "
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" já foi %sassinado pela chave %08lX\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" já foi %sassinado pela chave %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/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 "só pode assinar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:534
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "esta mensagem poderá não ser utilizável pelo 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"
@@ -2397,27 +2429,27 @@ msgstr ""
 "pertence\n"
 "à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Não vou responder.%s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Não verifiquei.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%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: \""
@@ -2425,32 +2457,32 @@ msgstr ""
 "Você tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\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"
 "A assinatura será marcada como não-exportável.\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"
 "A assinatura será marcada como não-revocável.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2458,7 +2490,7 @@ msgstr ""
 "\n"
 "A assinatura será marcada como não-exportável.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2466,7 +2498,7 @@ msgstr ""
 "\n"
 "A assinatura será marcada como não-revocável.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2474,7 +2506,7 @@ msgstr ""
 "\n"
 "Não verifiquei esta chave.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2482,7 +2514,7 @@ msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2490,33 +2522,33 @@ msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: 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 "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave primária não disponíveis.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossível editar esta chave: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2524,7 +2556,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\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"
@@ -2532,467 +2564,467 @@ msgstr ""
 "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Você quer realmente fazer isso? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: 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 "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 msgid "sign the key non-revocably"
 msgstr "assina a chave de forma não-revogável"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 msgid "sign the key locally and non-revocably"
 msgstr "assinar a chave localmente e de forma não revogável"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotográfico"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "addkey"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr "seleccionar o identificador do utilizador como primário"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: 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 "lista preferências (perito)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "list preferences (verbose)"
 msgstr "lista preferências (detalhadamente)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 msgid "set preference list"
 msgstr "configurar lista de preferências"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 msgid "updated preferences"
 msgstr "preferências actualizadas"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr "mostrar identificador fotográfico"
 
-#: 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 "impossível fazer isso em modo não-interativo\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave está revogada.\n"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando não é permitido no modo %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 "Você precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Você não pode remover o último ID de utilizador!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: 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 "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Você quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Você quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Realmente actualizar as preferências para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 msgid "Really update the preferences? "
 msgstr "Realmente actualizar as preferências?"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Gravar alterações? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Esta chave pode ser revogada pela chave %s %s%s\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr " (sensível)"
 
-#: 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  criada: %s expira: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- revogação falsa encontrada\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao verificar revogação: %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"
@@ -3001,110 +3033,110 @@ msgstr ""
 "AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n"
 "       algumas versão do PGP podem rejeitá-la.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (y/n) "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o tamanho da chave"
 
-#: 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 "Por favor remova as selecções das chaves secretas.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\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 "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3113,7 +3145,7 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3122,59 +3154,59 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (y/n) "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %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 "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\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 ""
@@ -3188,7 +3220,7 @@ msgstr "Politica de assinatura: "
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: 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 "AVISO: dados de notação inválidos encontrados\n"
 
@@ -3210,157 +3242,166 @@ msgid "Keyring"
 msgstr "Porta-chaves"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Impressão digital:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "listar as chaves e as impressões digitais"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "  Impressão da chave ="
 
-#. 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 "       Impressão digital:"
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr "  Impressão da chave ="
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "  Impressão da chave ="
+
+#: g10/keylist.c:1010
 msgid "     Key fingerprint ="
 msgstr "  Impressão da chave ="
 
-#: 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 "dados cifrados com %s\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 "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave pública falhou: %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 "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO não disponível, a tentar utilizar %s em substituição\n"
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\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 "não consigo tratar estas assinaturas múltiplas\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 msgid "Expired signature from \""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %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 "não é uma assinatura separada\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
@@ -3381,12 +3422,12 @@ msgstr ""
 
 #: g10/misc.c:386
 #, fuzzy, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Aviso: dono pouco seguro em %s \"%s\"\n"
 
 #: g10/misc.c:418
 #, fuzzy, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permissões pouco seguras em %s \"%s\"\n"
 
 #: g10/misc.c:443
@@ -3448,7 +3489,7 @@ msgstr "variável de ambiente GPG_AGENT_INFO inválida\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versão %d do protocolo gpg-agent não é suportada\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 "impossível ligar a `%s': %s\n"
@@ -3594,42 +3635,41 @@ msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\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 "a pedir 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 "não consigo obter chave do servidor: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "erro ao enviar para `%s': estado=%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 "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "não consigo procurar no servidor de chaves: %s\n"
@@ -3661,28 +3701,28 @@ 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 ""
 "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\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 mais nova que a assinatura\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 mais nova que a assinatura\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit crítico desconhecido\n"
 
@@ -4072,33 +4112,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 "impossível fazer isso em modo não-interactivo sem utilizar \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Esta chave é secreta! - apagar de qualquer modo? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %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 "há uma 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 "utilize a opção \"--delete-secret-keys\" para a apagar primeiro.\n"
 
@@ -4521,6 +4565,12 @@ msgstr "%lu chave verificadas (%lu assinaturas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Impressão digital:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "       Impressão digital:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NOME=VALOR|usar estes dados de notação"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0a02d2b45..19f2b5ed4 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-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -19,7 +19,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: usando memória insegura!\n"
 
 #: util/secmem.c:89
@@ -51,7 +52,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "sair"
 
@@ -282,58 +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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
-msgstr ""
+#: cipher/random.c:369
+#, 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:348
+#: cipher/random.c:377
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:692
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -347,7 +349,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -359,7 +361,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(São necessários mais %d bytes)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -367,175 +369,175 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "simétrica"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padrão)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro público"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seqüências de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,166 +547,166 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usuário para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "usar como arquivo de saída"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "modo não-interativo: nunca perguntar"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro à lista de chaveiros"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto à lista"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padrão"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "ler opções do arquivo"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informações de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr ""
 "|DA|escrever informações de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opções de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
@@ -712,59 +714,59 @@ msgstr ""
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -784,15 +786,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -802,7 +804,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a operação padrão depende dos dados de entrada\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -810,260 +812,280 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\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 "NOTA: arquivo de opções padrão `%s' inexistente\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de opções `%s': %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo opções de `%s'\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "AVISO: `%s' é um arquivo vazio\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 "AVISO: `%s' é um arquivo vazio\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "chaveiro inválido"
+
+#: 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 "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: 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 "NOTA: %s não é para uso normal!\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 não é permitido com %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %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 ""
 
-#: 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 ""
 
-#: g10/g10.c:1531
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado não é válido\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 "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 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 deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %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 [nome_do_arquivo]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuário"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuário [comandos]"
 
-#: 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 "impossível abrir %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] [id-usuário] [chaveiro]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas não fica claro
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Vá em frente e digite sua mensagem ...\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 "impossível abrir `%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 "
@@ -1072,16 +1094,16 @@ msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
@@ -1530,7 +1552,7 @@ msgstr "   (%d) ElGamal (apenas criptografia)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Sua opção? "
 
@@ -1538,7 +1560,7 @@ msgstr "Sua opção? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
@@ -1777,7 +1799,7 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:784 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
@@ -1871,7 +1893,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %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"
@@ -1879,7 +1901,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\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"
@@ -1895,86 +1917,86 @@ msgstr ""
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: 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 ""
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:132 g10/encode.c:357
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\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: impossível abrir: %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 "erro na criação da frase secreta: %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: AVISO: arquivo vazio\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 ""
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%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 ""
 
-#: 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 "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n"
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %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
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "usuário `%s' não encontrado: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:81 g10/export.c:213
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -2004,259 +2026,264 @@ msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usuários: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             não modificados: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usuários: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogações 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 não modificadas: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\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 "chave %08lX: sem ID de usuário\n"
 
-#: g10/import.c:544
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "chave %08lX: sem subchave para ligação de chaves\n"
+
+#: g10/import.c:663
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceito ID de usuário sem auto-assinatura '"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usuários válidos\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\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 "chave %08lX: chave pública não encontrada: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "impossível escrever chaveiro: %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 "escrevendo para `%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 "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:596
+#: 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:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\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 "chave %08lX: impossível localizar bloco de chaves original: %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 "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usuário\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usuários\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: não modificada\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "impossível bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:781
+#: 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:785
+#: g10/import.c:904
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: já está no chaveiro secreto\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta não encontrada: %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 ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogação\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revogação importado\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usuário para assinatura\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 "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usuário '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -2265,200 +2292,205 @@ msgstr "chave %08lX: subchave 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:1047
+#: g10/import.c:1170
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogação no local errado - ignorada\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - ignorada\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "chave %08lX: certificado de revogação no local errado - ignorada\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usuário duplicado - unido\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 "chave %08lX: certificado de revogação adicionado\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[revogação]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\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 assinaturas incorretas\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 assinatura não verificada por falta de chave\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 assinaturas não verificadas por falta de chaves\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 assinatura não verificada devido a um erro\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 assinaturas não verificadas devido a erros\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usuário sem auto-assinatura válida detectado\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usuários sem auto-assinaturas válidas detectados\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave é protegida.\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 "Você tem certeza de que quer este tamanho de chave? "
 
-#: 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 "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/keyedit.c:395
+#: 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:404
+#: 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:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Já assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Já assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:531
+#: 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:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:556
+#: 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:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2466,32 +2498,32 @@ msgstr ""
 "Você tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\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 ""
 "A assinatura será marcada como não-exportável.\n"
 "\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 ""
 "A assinatura será marcada como não-exportável.\n"
 "\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, fuzzy
 msgid ""
 "\n"
@@ -2500,7 +2532,7 @@ msgstr ""
 "A assinatura será marcada como não-exportável.\n"
 "\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 #, fuzzy
 msgid ""
 "\n"
@@ -2509,52 +2541,52 @@ msgstr ""
 "A assinatura será marcada como não-exportável.\n"
 "\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: 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 "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta não disponível"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossível editar esta chave: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2562,7 +2594,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\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"
@@ -2570,592 +2602,592 @@ msgstr ""
 "Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Você realmente quer fazer isso? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usuários"
 
-#: 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 "seleciona ID de usuário N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "remove ID de usuário"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "revkey"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "set preference list"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr ""
 
-#: 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 "impossível fazer isso em modo não-interativo\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usuário? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de usuário para assinar\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: 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 "Você precisa selecionar pelo menos um ID de usuário.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Você não pode remover o último ID de usuário!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usuário? "
 
-#: 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 "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Você realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Você realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Você realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Você realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Salvar alterações? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualização falhou: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma atualização é necessária.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr ""
 
-#: 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 ""
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! a subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- revogações de chaves incorreta\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: 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"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: 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 "Por favor remova as seleções das chaves secretas.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de usuário.\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 "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usuário com índice %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "ID de usuário: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3164,7 +3196,7 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3173,59 +3205,59 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Você assinou estes IDs de usuário:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Você está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %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 "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\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 ""
@@ -3240,7 +3272,7 @@ msgstr "assinatura %s de: %s\n"
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: 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 "AVISO: dados de notação inválidos encontrados\n"
 
@@ -3263,161 +3295,170 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Impressão digital:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "listar as chaves e as impressões digitais"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "       Impressão digital:"
 
-#. 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:"
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
 msgstr "       Impressão digital:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "       Impressão digital:"
+
+#: g10/keylist.c:1010
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "       Impressão digital:"
 
-#: 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 "dados criptografados com %s\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 "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revogação isolada - use \"gpg --import\" para aplicá-la\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\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
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %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
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
@@ -3439,12 +3480,12 @@ msgstr ""
 
 #: g10/misc.c:386
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:418
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:443
@@ -3506,7 +3547,7 @@ msgstr ""
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de proteção %d não é suportado\n"
 
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
@@ -3655,42 +3696,41 @@ msgstr "NOTA: chave secreta %08lX expirou %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
+#: g10/hkp.c:71
 #, fuzzy, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+msgid "requesting key %08lX from %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
@@ -3724,28 +3764,28 @@ 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 ""
 "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\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 mais nova que a assinatura\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 mais nova que a assinatura\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n"
 
@@ -4135,33 +4175,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 "impossível fazer isso em modo não-interativo sem \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Esta é uma chave secreta! - realmente deletar? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumeração de blocos de chaves falhou: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "há uma chave secreta para esta chave pública!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a opção \"--delete-secret-key\" para deletá-la antes.\n"
@@ -4529,6 +4573,12 @@ msgstr "listar as chaves e as assinaturas"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Impressão digital:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "       Impressão digital:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NOME=VALOR|usar estes dados de notação"
 
diff --git a/po/sv.po b/po/sv.po
index ff87321d0..80ab4ef88 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-06-29 23:05+0200\n"
+"POT-Creation-Date: 2002-08-03 13:02+0200\n"
 "PO-Revision-Date: 2001-08-23 10:32+02:00\n"
 "Last-Translator: Daniel Resare <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -22,7 +22,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 "Varning: använder osäkert minne!\n"
 
 #: util/secmem.c:89
@@ -53,7 +54,7 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
 msgid "quit"
 msgstr "avsluta"
 
@@ -286,58 +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:320 g10/import.c:145 g10/keygen.c:1809
+#: cipher/random.c:349 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:324
+#: cipher/random.c:353
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: cipher/random.c:329
+#: cipher/random.c:358
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
-#: cipher/random.c:334
+#: cipher/random.c:363
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed är tom\n"
 
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:369
+#, 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:348
+#: cipher/random.c:377
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: cipher/random.c:386
+#: cipher/random.c:415
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:435
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:442
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:445
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:691
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:692
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -352,7 +354,7 @@ msgstr ""
 "ANVÄND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:134
 #, c-format
 msgid ""
 "\n"
@@ -364,7 +366,7 @@ msgstr ""
 "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
 "(Behöver %d fler byte)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -372,170 +374,170 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:309
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normalläge)"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:313
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "räkna upp nycklar"
 
-#: g10/g10.c:315
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "räkna upp nycklar och signaturer"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:317
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "räkna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "räkna upp hemliga nycklar"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "ta bort en nyckel från den publika nyckelringen"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "ta bort en nyckel från den hemliga nyckelringen"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "generera ett återkallelesecertifikat"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exportera de värden som representerar ägartillit"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importera värden som representerar ägartillit"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:354
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal för en fil eller standard in"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,199 +547,199 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardvärdet för mottagare"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:375
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att slå av kompression)"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/g10.c:385
+#: g10/g10.c:389
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:387
+#: g10/g10.c:391
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: g10/g10.c:388
+#: g10/g10.c:392
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "force v3 signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:392
+#: g10/g10.c:396
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: g10/g10.c:397
+#: g10/g10.c:401
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
 # syftar på ett användargränsnitt i ett separat program, till exempel gpa
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:403
 msgid "use the gpg-agent"
 msgstr "använd gpg-agenten"
 
-#: g10/g10.c:402
+#: g10/g10.c:406
 msgid "batch mode: never ask"
 msgstr "batch-läge: fråga aldrig"
 
-#: g10/g10.c:403
+#: g10/g10.c:407
 msgid "assume yes on most questions"
 msgstr "anta att svaret är ja på de flesta frågor"
 
-#: g10/g10.c:404
+#: g10/g10.c:408
 msgid "assume no on most questions"
 msgstr "anta att svaret är nej på de flesta frågor"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:406
+#: g10/g10.c:410
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:407
+#: g10/g10.c:411
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:408
+#: g10/g10.c:412
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/g10.c:409
+#: g10/g10.c:413
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd denna nyckelserver för att slå upp nycklar"
 
-#: g10/g10.c:411
+#: g10/g10.c:417
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "read options from file"
 msgstr "läs flaggor från fil"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:430
+#: g10/g10.c:436
 msgid "|KEYID|ultimately trust this key"
 msgstr "|NYCKELID|lita ovillkorligen på denna nyckel"
 
-#: g10/g10.c:431
+#: g10/g10.c:437
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda tilläggsmodul FIL"
 
-#: g10/g10.c:432
+#: g10/g10.c:438
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera läget som beskrivs i RFC1991"
 
-#: g10/g10.c:433
+#: g10/g10.c:439
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "ställ om alla flaggor så att gpg följer OpenPGP-standarden"
 
-#: g10/g10.c:434
+#: g10/g10.c:440
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "ställ om alla flaggor så att gpg följer OpenPGP-standarden"
 
-#: g10/g10.c:440
+#: g10/g10.c:446
 msgid "|N|use passphrase mode N"
 msgstr "|N|använd lösenordsläget N"
 
-#: g10/g10.c:442
+#: g10/g10.c:448
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:444
+#: g10/g10.c:450
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|använd chifferalgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: g10/g10.c:447
+#: g10/g10.c:453
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:449
+#: g10/g10.c:455
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: g10/g10.c:450
+#: g10/g10.c:456
 msgid "throw keyid field of encrypted packets"
 msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
 
-#: g10/g10.c:451
+#: g10/g10.c:457
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:452
+#: g10/g10.c:458
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:453
+#: g10/g10.c:459
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:459
+#: g10/g10.c:465
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -745,7 +747,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:468
 msgid ""
 "@\n"
 "Examples:\n"
@@ -765,17 +767,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:620
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera gärna fel till <gnupg-bugs@gnu.org>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <sv@li.org>.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:624
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: g10/g10.c:620
+#: g10/g10.c:627
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -785,7 +787,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:638
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -793,107 +795,127 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:742
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:792
+#: g10/g10.c:799
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\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 "OBSERVERA: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:1014
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1021
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser flaggor från \"%s\"\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1323
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1341
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1340
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "VARNING: \"%s\" är en tom fil\n"
+
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "felaktigt skal"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "VARNING: \"%s\" är en tom fil\n"
+
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "felaktig nyckelring"
+
+#: 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 "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1510
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: 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 "OBSERVERA: %s är inte för normal användning!\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 är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1522
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %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 ""
 
-#: 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 ""
 
-#: g10/g10.c:1531
+#: g10/g10.c:1561
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1574
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/g10.c:1601 g10/g10.c:1619
+#: g10/g10.c:1635 g10/g10.c:1653
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\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 "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:1613
+#: g10/g10.c:1647
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:1628
+#: g10/g10.c:1662
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
@@ -904,157 +926,157 @@ msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
 # är ändå litet. Eventuellt borde meddelandena inte alls
 # översättas för att göra eventuell felsökning lättare
 # för internationella felsökare
-#: g10/g10.c:1630
+#: g10/g10.c:1664
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1666
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1668
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
-#: g10/g10.c:1637
+#: g10/g10.c:1671
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBSERVERA: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1675
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1679
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1651
+#: g10/g10.c:1685
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "skriv ut inställningar"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1693
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "skriv ut inställningar"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1697
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "skriv ut inställningar"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1701
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "skriv ut inställningar"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1795
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %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 [filnamn]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1822
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1830
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1847
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1860
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1874
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1883
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1901
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1912
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1920
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1928
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1936
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1944
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: 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 "kan inte öppna %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] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:2107
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:2115
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2288
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2292
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
 # se förra kommentaren
-#: 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 "kan inte öppna \"%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 "
@@ -1063,16 +1085,16 @@ msgstr ""
 "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:2483
+#: g10/g10.c:2518
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
-#: g10/g10.c:2520
+#: g10/g10.c:2555
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "angiven URL är ogiltig\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2557
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "angiven URL är ogiltig\n"
@@ -1521,7 +1543,7 @@ msgstr "   (%d) ElGamal (endast kryptering)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signering och kryptering)\n"
 
-#: g10/keyedit.c:572 g10/keygen.c:956
+#: g10/keyedit.c:573 g10/keygen.c:956
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
@@ -1529,7 +1551,7 @@ msgstr "Vad väljer du? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Användanadet av denna algoritm är förlegat - skapa ändå? "
 
-#: g10/keyedit.c:585 g10/keygen.c:998
+#: g10/keyedit.c:586 g10/keygen.c:998
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
@@ -1770,7 +1792,7 @@ msgstr ""
 "Du behöver en lösenordsfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:784 g10/keygen.c:1393
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenordsfrasen upprepades ej korrekt; försök igen.\n"
@@ -1865,7 +1887,7 @@ msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: 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"
@@ -1873,7 +1895,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\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"
@@ -1889,86 +1911,86 @@ msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: 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 ""
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:132 g10/encode.c:357
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu nycklar behandlade\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: kan inte öppna: %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 "fel vid skapandet av lösenordsfras: %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: VARNING: tom fil\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 ""
 
-#: g10/encode.c:368
+#: g10/encode.c:374
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%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 ""
 
-#: 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 "OBSERVERA: chifferalgoritmen %d finns inte i inställningarna\n"
 
-#: g10/encode.c:646
+#: g10/encode.c:652
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad för: %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
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "användaren \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:81 g10/export.c:213
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:222
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "nyckeln %08lX följer inte standarden RFC2440 - överhoppad\n"
 
-#: g10/export.c:188
+#: g10/export.c:238
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - överhoppad\n"
 
-#: g10/export.c:196
+#: g10/export.c:246
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: ny nyckel - överhoppad\n"
 
-#: g10/export.c:279
+#: g10/export.c:344
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
@@ -1997,260 +2019,265 @@ msgstr "använder sekundära nyckeln %08lX istället för primärnyckeln %08lX\n"
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade över\n"
 
-#: g10/import.c:206
+#: g10/import.c:256
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:213
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:218
+#: g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/import.c:230
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:232
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:235
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:237
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:243
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:245
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:247
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:249
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:251
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     nya återkallelser av nycklar: %lu\n"
 
-#: g10/import.c:253
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:255
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:257
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:479
+#: g10/import.c:593
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\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 "nyckel %08lX: ingen användaridentitet\n"
 
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
+
 # vad innebär fnutten i slutet?
-#: g10/import.c:544
+#: g10/import.c:663
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "nyckel %08lX: accepterade icke självsignerad användaridentitet '"
 
-#: g10/import.c:551
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:553
+#: g10/import.c:672
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\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 "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nyckeln %08lX: ny nyckel - överhoppad\n"
 
-#: g10/import.c:578
+#: g10/import.c:697
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %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 "skriver till \"%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 "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:596
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade publik nyckel\n"
 
-#: g10/import.c:617
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\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 "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %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 "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:792
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: 1 ny användaridentitet\n"
 
-#: g10/import.c:676
+#: g10/import.c:795
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya användaridentiteter\n"
 
-#: g10/import.c:679
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:682
+#: g10/import.c:801
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:685
+#: g10/import.c:804
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:688
+#: g10/import.c:807
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:700
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "nyckel %08lX: inte förändrad\n"
 
-#: g10/import.c:770
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen förvald publik nyckel\n"
 
-#: g10/import.c:781
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\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 "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:790
+#: g10/import.c:909
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %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 ""
 "nyckel %08lX: ingen publik nyckel - kan inte tillämpa "
 "återkallelsecertifikatet\n"
 
-#: g10/import.c:859
+#: g10/import.c:978
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt återkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:891
+#: g10/import.c:1010
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: återkallelsecertifikat importerat\n"
 
-#: g10/import.c:928
+#: g10/import.c:1047
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\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 "nyckel %08lX: algoritmen för publik nyckel ej stödd\n"
 
-#: g10/import.c:943
+#: g10/import.c:1062
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig självsignatur\n"
 
-#: g10/import.c:960
+#: g10/import.c:1079
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:970
+#: g10/import.c:1089
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för publik nyckel ej stödd\n"
 
-#: g10/import.c:971
+#: g10/import.c:1090
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1001
+#: g10/import.c:1121
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1024
+#: g10/import.c:1144
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
@@ -2259,200 +2286,205 @@ msgstr "nyckel %08lX: hoppade över undernyckel\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 "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över\n"
 
-#: g10/import.c:1056
+#: g10/import.c:1179
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %08lX: återkallelsecertifikat på fel plats - hoppade över\n"
 
-#: g10/import.c:1073
+#: g10/import.c:1196
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt återkallelsecertifikat: %s - hoppade över\n"
 
-#: g10/import.c:1174
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "nyckel %08lX: återkallelsecertifikat på fel plats - hoppade över\n"
+
+#: g10/import.c:1306
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "nyckel %08lX: användaridentitet hittades två gånger - slog ihop\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 "nyckel %08lX: lade till återkallelsecertifikat\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:144
 msgid "[revocation]"
 msgstr "[återkallelse]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:145
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:216 g10/keylist.c:148
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\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 felaktiga signaturer\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 signatur verifierades inte eftersom nyckeln saknades\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 signaturer verifierades inte eftersom nycklar saknades\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 signatur verifierades inte eftersom ett fel uppstod\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 signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:228
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:230
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig självsignatur hittades\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:357
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Nyckeln är skyddad.\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 "Är du säker på att du vill ha denna nyckelstorlek? "
 
-#: 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 "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/keyedit.c:395
+#: 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:404
+#: 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:418
+#: g10/keyedit.c:419
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:423
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:447
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:460
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:475
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Notera: Denna nyckel har gått ut!\n"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:495
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:499
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:531
+#: 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:533
+#: g10/keyedit.c:534
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:556
+#: 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:560
+#: g10/keyedit.c:561
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:563
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:565
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:567
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2460,32 +2492,32 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "detta kan bero på att det saknas en självsignatur\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 ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\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 ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, fuzzy
 msgid ""
 "\n"
@@ -2494,7 +2526,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:621
 #, fuzzy
 msgid ""
 "\n"
@@ -2503,51 +2535,51 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:626
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:630
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:634
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:643
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: 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 "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:741
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:745
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:769
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:775
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2555,7 +2587,7 @@ msgstr ""
 "Skriv in den nya lösenordsfrasen för denna hemliga nyckel.\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"
@@ -2563,592 +2595,592 @@ msgstr ""
 "Du vill inte ha någon lösenordsfras - detta är sannolikt en dålig idé!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:792
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:856
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:898
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:899
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:900
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:901
 msgid "show this help"
 msgstr "visa denna hjälp"
 
 # skall dessa översättas?
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:903
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:904
 msgid "list key and user IDs"
 msgstr "räkna upp nycklar och användaridentiteter"
 
-#: 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 "välj användaridentitet N"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:907
 msgid "select secondary key N"
 msgstr "välj sekundär nyckel N"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:908
 msgid "list signatures"
 msgstr "räkna upp signaturer"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:909
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:910
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:911
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:912
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:913
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:914
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:916
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:917
 #, fuzzy
 msgid "add a photo ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:918
 msgid "delete user ID"
 msgstr "ta bort en användaridentitet"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:920
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:921
 msgid "add a secondary key"
 msgstr "lägg till en sekundär nyckel"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:922
 msgid "delete a secondary key"
 msgstr "ta bort en sekundär nyckel"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "addrevoker"
 msgstr "addkey"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "add a revocation key"
 msgstr "lägg till en sekundär nyckel"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:924
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:925
 msgid "change the expire date"
 msgstr "ändra utgångsdatum"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:927
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:929
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:930
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
 #, fuzzy
 msgid "set preference list"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:933
 #, fuzzy
 msgid "updated preferences"
 msgstr "skriv ut inställningar"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:934
 msgid "change the passphrase"
 msgstr "ändra lösenordsfrasen"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:936
 msgid "revoke signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:937
 msgid "revoke a secondary key"
 msgstr "återkalla en sekundär nyckel"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:938
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:939
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
 msgid "show photo ID"
 msgstr ""
 
-#: 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 "kan ej göra detta i batch-läge\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:997
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1015
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1046
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1078
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1082
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1131
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1150
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1151
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj det användarid du vill signera\n"
 
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1176
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: 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 "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1198
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1201
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1202
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: 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 "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1244
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1245
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1281
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen återkalla de valda nycklarna? "
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1282
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen återkalla denna nyckel? "
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1351
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1353
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Vill du verkligen skapa återkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1391
 msgid "Save changes? "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1394
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1405
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1412
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1419
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1431
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "VARNING: Denna nyckel har återkallats av sin ägare!\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1751
 msgid " (sensitive)"
 msgstr ""
 
-#: 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  skapad: %s går ut: %s"
 
-#: g10/keyedit.c:1759
+#: g10/keyedit.c:1766
 #, c-format
 msgid " trust: %c/%c"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1770
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1799
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! en undernyckel har återkallats: %s\n"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1802
 msgid "rev- faked revocation found\n"
 msgstr "rev- hittade felaktig återkallelse\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1804
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem vid kontroll av återkallandet: %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"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1935
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:1934
+#: g10/keyedit.c:1941
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2069
+#: g10/keyedit.c:2076
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2086
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2090
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2096
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du radera denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2110
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2111
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2114
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2210
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange storleken på nyckeln"
 
-#: 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 "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2328
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som mest en sekundär nyckel.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2332
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en sekundär nyckel.\n"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2334
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2376
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:2384
+#: g10/keyedit.c:2392
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2475
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\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 "nyckel %08lX: ogiltig självsignatur\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2679
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2725
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundär nyckel med index %d\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2839
 msgid "user ID: \""
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2844
 #, c-format
 msgid ""
 "\"\n"
@@ -3157,7 +3189,7 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2847
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3166,59 +3198,59 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2852
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "%s-signatur från: %s\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2856
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen återkalla denna nyckel? "
 
-#: g10/keyedit.c:2852
+#: g10/keyedit.c:2860
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett återkallelsecertifikat för denna signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2885
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2904
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2912
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   återkallad av %08lX %s\n"
 
-#: g10/keyedit.c:2919
+#: g10/keyedit.c:2932
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2942
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signerad av %08lX %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 "Vill du verkligen skapa återkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2981
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\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 ""
@@ -3233,7 +3265,7 @@ msgstr "%s-signatur från: %s\n"
 msgid "Signature policy: "
 msgstr "%s-signatur från: %s\n"
 
-#: 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 "VARNING: ogiltig notationsdata hittades\n"
 
@@ -3256,38 +3288,47 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:478 g10/mainproc.c:899
 #, c-format
 msgid " [expires: %s]"
 msgstr "[går ut: %s]"
 
-#: g10/keylist.c:952
-msgid "Fingerprint:"
-msgstr "Fingeravtryck:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "räkna upp nycklar och fingeravtryck"
+
+#: g10/keylist.c:997
+#, fuzzy
+msgid "     Subkey fingerprint:"
+msgstr "           Fingeravtryck:"
 
-#. 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:"
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:1006
+#, fuzzy
+msgid "      Subkey fingerprint:"
+msgstr "           Fingeravtryck:"
+
+#: g10/keylist.c:1010
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "           Fingeravtryck:"
 
-#: 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 krypterad data\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 "krypterad med en okänd algoritm %d\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:312
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln är %08lX\n"
@@ -3299,126 +3340,126 @@ msgstr "den publika nyckeln är %08lX\n"
 # rätt publik nyckel att kryptera datat med. Jag tycker
 # inte att svenska översättningen är mycket obskyrare än engelska
 # originalet iallafall.
-#: g10/mainproc.c:357
+#: g10/mainproc.c:358
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:410
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:420
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:433
+#: g10/mainproc.c:434
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:461 g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:468
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:497
+#: g10/mainproc.c:498
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:505
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:530
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBSERVERA: avsändaren efterfrågade \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:532
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:707
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående återkallelsecertifikat - använd \"gpg --import\" för\n"
 "att applicera\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:775
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det någon bra svensk översättning av policy?
-#: g10/mainproc.c:783
+#: g10/mainproc.c:787
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1242
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\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 "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1305
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
 
-#: g10/mainproc.c:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
 msgid "Good signature from \""
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1391
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1422
 msgid "                aka \""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1483
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %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 "ingen frikopplad signatur\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1579
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1636
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1643
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -3439,12 +3480,12 @@ msgstr ""
 
 #: g10/misc.c:386
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:418
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:443
@@ -3506,7 +3547,7 @@ msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "skyddsalgoritmen %d stöds inte\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 "kan inte ansluta till \"%s\": %s\n"
@@ -3651,42 +3692,41 @@ msgstr "OBSERVERA: den hemliga nyckeln %08lX gick ut %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "nyckeln %08lX: nyckeln har återkallats!\n"
 
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
+#: g10/hkp.c:71
 #, fuzzy, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+msgid "requesting key %08lX from %s\n"
 msgstr "fråga efter nyckeln %08lX från %s ...\n"
 
-#: g10/hkp.c:94
+#: g10/hkp.c:96
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan inte hämta nyckeln från en nyckelserver: %s\n"
 
-#: g10/hkp.c:171
+#: g10/hkp.c:175
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fel vid sändning till \"%s\": %s\n"
 
-#: g10/hkp.c:186
+#: g10/hkp.c:190
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "lyckades sända till \"%s\" (status=%u)\n"
 
-#: g10/hkp.c:189
+#: g10/hkp.c:193
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades sända till \"%s\": status=%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 ""
 
-#: g10/hkp.c:543
+#: g10/hkp.c:547
 #, fuzzy, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "kan inte hämta nyckeln från en nyckelserver: %s\n"
@@ -3719,29 +3759,29 @@ msgstr "VARNING: Upptäckte en svag nyckel - byt lösenordsfras igen.\n"
 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 ""
 "detta är en PGP-genererad ElGamal-nyckel som INTE är säker för signaturer!\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "den publika nyckeln är %lu sekund nyare än signaturen\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 "den publika nyckeln är %lu sekunder nyare än signaturen\n"
 
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %08lX, gick ut vid %s\n"
 
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen är felaktig eftersom en okänd kritisk bit är satt\n"
@@ -4129,33 +4169,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 "kan inte göra så i batch-läge utan flaggan \"--yes\"\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:150
 msgid "Delete this key from the keyring? "
 msgstr "Vill du ta bort denna nyckel från nyckelringen? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:158
 msgid "This is a secret key! - really delete? "
 msgstr "Detta är en hemlig nyckel! - vill du verkligen ta bort den? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:168
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "numrering av nyckelblock misslyckades: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:178
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:194
+#: g10/delkey.c:206
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel tillhörande denna publika nyckel!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:208
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-key\" för att ta bort den först.\n"
@@ -4548,6 +4592,12 @@ msgstr "räkna upp nycklar och signaturer"
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingeravtryck:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "           Fingeravtryck:"
+
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NAMN=VÄRDE|använd detta sätt för att beskriva data"
 
diff --git a/po/tr.po b/po/tr.po
index f74856625..1b31b8e4c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-06-29 23:05+0200\n"
-"PO-Revision-Date: 2002-04-21 15:14+0300\n"
+"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"PO-Revision-Date: 2002-05-10 15:58+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +20,7 @@ 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"
@@ -48,7 +46,7 @@ msgstr "hayır"
 msgid "nN"
 msgstr "hH"
 
-#: g10/keyedit.c:897 util/miscutil.c:333
+#: g10/keyedit.c:815 util/miscutil.c:333
 msgid "quit"
 msgstr "çıkış"
 
@@ -275,7 +273,7 @@ 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:1809
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -340,7 +338,7 @@ msgstr ""
 "BU PROGRAMLA ÜRETİLMİŞ HİÇBİR VERİYİ KULLANMAYIN!!\n"
 "\n"
 
-#: cipher/rndlinux.c:140
+#: cipher/rndlinux.c:142
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +350,7 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/g10.c:300
+#: g10/g10.c:287
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +358,163 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:302
+#: g10/g10.c:289
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:303
+#: g10/g10.c:290
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:304
+#: g10/g10.c:291
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:305
+#: g10/g10.c:292
 msgid "encrypt data"
 msgstr "veriyi ÅŸifreler"
 
-#: g10/g10.c:306
+#: g10/g10.c:293
 msgid "|[files]|encrypt files"
 msgstr "|[dosyalar]|dosyalar ÅŸifrelenir"
 
-#: g10/g10.c:307
+#: g10/g10.c:294
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik ÅŸifre ile ÅŸifreler"
 
-#: g10/g10.c:308
+#: g10/g10.c:295
 msgid "store only"
 msgstr "sadece saklar"
 
-#: g10/g10.c:309
+#: g10/g10.c:296
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:310
+#: g10/g10.c:297
 msgid "|[files]|decrypt files"
 msgstr "|[dosyalar]|dosyaların şifresi açılır"
 
-#: g10/g10.c:311
+#: g10/g10.c:298
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:313
+#: g10/g10.c:300
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:315
+#: g10/g10.c:302
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:316
+#: g10/g10.c:303
 msgid "check key signatures"
 msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:317
+#: g10/g10.c:304
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:318
+#: g10/g10.c:305
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:319
+#: g10/g10.c:306
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:320
+#: g10/g10.c:307
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:322
+#: g10/g10.c:309
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:323
+#: g10/g10.c:310
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:324
+#: g10/g10.c:311
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:325
+#: g10/g10.c:312
 msgid "sign a key non-revocably"
 msgstr "bir anahtarı iptal edilemez olarak imzalar"
 
-#: g10/g10.c:326
+#: g10/g10.c:313
 msgid "sign a key locally and non-revocably"
 msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar"
 
-#: g10/g10.c:327
+#: g10/g10.c:314
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:328
+#: g10/g10.c:315
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:330
+#: g10/g10.c:316
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:331
+#: g10/g10.c:317
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:332
+#: g10/g10.c:318
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:334
+#: g10/g10.c:320
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:336
+#: g10/g10.c:322
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:340
+#: g10/g10.c:326
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:342
+#: g10/g10.c:328
 msgid "list only the sequence of packets"
 msgstr "sadece paketlerin silsilesini listeler"
 
-#: g10/g10.c:344
+#: g10/g10.c:330
 msgid "export the ownertrust values"
 msgstr "sahibiningüvencesi değerlerini gönderir"
 
-#: g10/g10.c:346
+#: g10/g10.c:332
 msgid "import ownertrust values"
 msgstr "sahibiningüvencesi değerlerini indirir"
 
-#: g10/g10.c:348
+#: g10/g10.c:334
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:350
+#: g10/g10.c:336
 msgid "unattended trust database update"
 msgstr "bakımsız güvence veritabanının güncellemesi"
 
-#: g10/g10.c:351
+#: g10/g10.c:337
 msgid "fix a corrupted trust database"
 msgstr "bozulan güvence veritabanını onarır"
 
-#: g10/g10.c:352
+#: g10/g10.c:338
 msgid "De-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdinin zırhını kaldırır"
 
-#: g10/g10.c:354
+#: g10/g10.c:340
 msgid "En-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdiyi zırhlar"
 
-#: g10/g10.c:356
+#: g10/g10.c:342
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:360
+#: g10/g10.c:346
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,194 +524,196 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:362
+#: g10/g10.c:348
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:364
+#: g10/g10.c:350
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:367
+#: g10/g10.c:353
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: g10/g10.c:369
+#: g10/g10.c:355
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: g10/g10.c:375
+#: g10/g10.c:361
 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:376
+#: g10/g10.c:362
 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:378
+#: g10/g10.c:364
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:385
+#: g10/g10.c:371
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:386
+#: g10/g10.c:372
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:387
+#: g10/g10.c:373
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/g10.c:388
+#: g10/g10.c:374
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: g10/g10.c:389
+#: g10/g10.c:375
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: g10/g10.c:390
+#: g10/g10.c:376
 msgid "do not force v3 signatures"
 msgstr "v3 imzalara zorlamaz"
 
-#: g10/g10.c:391
+#: g10/g10.c:377
 msgid "force v4 key signatures"
 msgstr "v4 imzalara zorlar"
 
-#: g10/g10.c:392
+#: g10/g10.c:378
 msgid "do not force v4 key signatures"
 msgstr "v4 imzalara zorlamaz"
 
-#: g10/g10.c:393
+#: g10/g10.c:379
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: g10/g10.c:395
+#: g10/g10.c:381
 msgid "never use a MDC for encryption"
 msgstr "şifreleme için asla bir MDC kullanılmaz"
 
-#: g10/g10.c:397
+#: g10/g10.c:383
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:399
+#: g10/g10.c:385
 msgid "use the gpg-agent"
 msgstr "gpg-agent kullan"
 
-#: g10/g10.c:402
+#: g10/g10.c:388
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: g10/g10.c:403
+#: g10/g10.c:389
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: g10/g10.c:404
+#: g10/g10.c:390
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: g10/g10.c:405
+#: g10/g10.c:391
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: g10/g10.c:406
+#: g10/g10.c:392
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar zincirini listeye ekler"
 
-#: g10/g10.c:407
+#: g10/g10.c:393
 msgid "show which keyring a listed key is on"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/g10.c:408
+#: g10/g10.c:394
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/g10.c:409
+#: g10/g10.c:395
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: g10/g10.c:411
+#: g10/g10.c:397
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|Ä°SÄ°M|terminal karakter setini Ä°SÄ°M olarak ayarlar"
 
-#: g10/g10.c:412
+#: g10/g10.c:398
 msgid "read options from file"
 msgstr "seçenekleri dosyadan okur"
 
-#: g10/g10.c:416
+#: g10/g10.c:402
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/g10.c:418
+#: g10/g10.c:404
 msgid "|[file]|write status info to file"
 msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
 
-#: g10/g10.c:430
+#: g10/g10.c:410
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ANHKİML|bu anahtar son derece güvenli"
 
-#: g10/g10.c:431
+#: g10/g10.c:411
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: g10/g10.c:432
+#: g10/g10.c:412
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 de açıklanan kipi uygular"
 
-#: g10/g10.c:433
+#: g10/g10.c:413
 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:434
+#: g10/g10.c:414
 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:440
+#: g10/g10.c:418
 msgid "|N|use passphrase mode N"
 msgstr "|N|anahtar parolası kipi olarak N kullanılır"
 
-#: g10/g10.c:442
+#: g10/g10.c:420
 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:444
+#: g10/g10.c:422
 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:446
+#: g10/g10.c:424
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:447
+#: g10/g10.c:425
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:449
+#: g10/g10.c:426
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: g10/g10.c:450
+#: g10/g10.c:427
 msgid "throw keyid field of encrypted packets"
 msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
 
-#: g10/g10.c:451
+#: g10/g10.c:428
 msgid "Show Photo IDs"
 msgstr "Foto kimliklerini gösterir"
 
-#: g10/g10.c:452
+#: g10/g10.c:429
 msgid "Don't show Photo IDs"
 msgstr "Foto kimliklerini göstermez"
 
-#: g10/g10.c:453
+#: g10/g10.c:430
 msgid "Set command line to view Photo IDs"
 msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
 
-#: g10/g10.c:459
+#: 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
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -721,7 +721,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:462
+#: g10/g10.c:437
 msgid ""
 "@\n"
 "Examples:\n"
@@ -741,15 +741,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:613
+#: g10/g10.c:579
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Yazılım hatalarını lütfen <gnupg-bugs@gnu.org> adresine bildirin.\n"
 
-#: g10/g10.c:617
+#: g10/g10.c:583
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:620
+#: g10/g10.c:586
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +759,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:597
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,274 +767,255 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:735
+#: g10/g10.c:671
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:792
+#: g10/g10.c:728
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:810
-#, c-format
-msgid "no values for group \"%s\"\n"
-msgstr ""
-
-#: g10/g10.c:997
+#: g10/g10.c:903
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1001
+#: g10/g10.c:907
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:914
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1309
+#: g10/g10.c:1197
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:1326
+#: g10/g10.c:1214
 msgid "could not parse keyserver URI\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1340
+#: 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:1476
+#: 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:1253 g10/g10.c:1270
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr "lütfen yerine \"--keyserver-options %s\" kullanınız\n"
+
+#: g10/g10.c:1347
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:1480
+#: g10/g10.c:1351
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:1487 g10/g10.c:1498
+#: g10/g10.c:1358 g10/g10.c:1369
 #, 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:1489 g10/g10.c:1509
+#: g10/g10.c:1360 g10/g10.c:1380
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1363
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1519
+#: g10/g10.c:1389
 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:1525
+#: g10/g10.c:1395
 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:1531
+#: g10/g10.c:1401
 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:1544
+#: g10/g10.c:1414
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n"
 
-#: g10/encode.c:342 g10/encode.c:404 g10/g10.c:1558 g10/sign.c:646
-#: g10/sign.c:878
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
 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:1601 g10/g10.c:1619
+#: g10/g10.c:1470 g10/g10.c:1482
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1607 g10/g10.c:1625
+#: g10/g10.c:1476 g10/g10.c:1488
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1613
-#, fuzzy
-msgid "selected certification 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:1628
+#: g10/g10.c:1499
 #, 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:1630
+#: g10/g10.c:1501
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:1632
+#: g10/g10.c:1503
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:1634
+#: g10/g10.c:1505
 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:1637
+#: g10/g10.c:1508
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1512
 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:1645
+#: g10/g10.c:1516
 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:1651
-#, fuzzy
-msgid "invalid default preferences\n"
-msgstr "tercihler geçersiz\n"
-
-#: g10/g10.c:1659
-#, fuzzy
-msgid "invalid personal cipher preferences\n"
-msgstr "tercihler geçersiz\n"
-
-#: g10/g10.c:1663
-#, fuzzy
-msgid "invalid personal digest preferences\n"
-msgstr "tercihler geçersiz\n"
-
-#: g10/g10.c:1667
-#, fuzzy
-msgid "invalid personal compress preferences\n"
+#: g10/g10.c:1519
+msgid "invalid preferences\n"
 msgstr "tercihler geçersiz\n"
 
-#: g10/g10.c:1761
+#: g10/g10.c:1613
 #, 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:1771
-msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
-
-#: g10/g10.c:1781
+#: g10/g10.c:1633
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:1788
+#: g10/g10.c:1640
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1648
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:1813
+#: g10/g10.c:1665
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:1826
+#: g10/g10.c:1678
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:1840
+#: g10/g10.c:1692
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:1849
+#: g10/g10.c:1701
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:1867
+#: g10/g10.c:1719
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:1878
+#: g10/g10.c:1730
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1738
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1894
+#: g10/g10.c:1746
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1754
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:1910
+#: g10/g10.c:1762
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/encode.c:362 g10/g10.c:1966 g10/sign.c:789
+#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: g10/g10.c:1981
+#: g10/g10.c:1833
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:2072
+#: g10/g10.c:1916
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:2080
+#: g10/g10.c:1924
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2011
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2097
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2101
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2260 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/g10.c:2474
-#, 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: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:2483
-msgid "a notation value must not use any control characters\n"
-msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\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:2520
-msgid "the given certification policy URL is invalid\n"
-msgstr "belirtilen sertifika güvence adresi geçersiz\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:2522
-msgid "the given signature policy URL is invalid\n"
-msgstr "belirtilen imza güvence adresi geçersiz\n"
+#: g10/g10.c:2333
+msgid "a notation value must not use any control characters\n"
+msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
 #: g10/armor.c:314
 #, c-format
@@ -1105,11 +1086,8 @@ 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"
@@ -1132,13 +1110,11 @@ msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
 #: g10/pkclist.c:73
-#, fuzzy
-msgid "reason for revocation: "
+msgid "Reason for revocation: "
 msgstr "Yürürlükten kaldırma sebebi: "
 
 #: g10/pkclist.c:90
-#, fuzzy
-msgid "revocation comment: "
+msgid "Revocation comment: "
 msgstr "Yürürlükten kaldırma açıklaması: "
 
 #. a string with valid answers
@@ -1214,8 +1190,7 @@ 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"
@@ -1242,10 +1217,8 @@ 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
@@ -1294,8 +1267,7 @@ 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"
@@ -1310,8 +1282,7 @@ 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
@@ -1323,31 +1294,28 @@ 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:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:773 g10/pkclist.c:967
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:803
+#: g10/pkclist.c:752
 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:816
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1355,130 +1323,120 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:832
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:913
+#: g10/pkclist.c:781 g10/pkclist.c:857
 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:855
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:862
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
 
-#: g10/pkclist.c:949
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/keygen.c:182
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "%c%lu tercihi geçersiz\n"
 
-#: g10/keygen.c:189
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "%c%lu tercihi yinelendi\n"
 
-#: g10/keygen.c:194
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "`%c' tercih çok fazla\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:257
 msgid "invalid character in preference string\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/keygen.c:524
-#, fuzzy
-msgid "writing direct signature\n"
-msgstr "öz-imza yazılıyor\n"
-
-#: g10/keygen.c:563
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:946
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: 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:572 g10/keygen.c:956
+#: g10/keyedit.c:516 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
+#: g10/keygen.c:809
 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:585 g10/keygen.c:998
+#: g10/keyedit.c:529 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1491,20 +1449,19 @@ msgstr ""
 "                  öntanımlı anahtar uzunluğu: 1024 bit\n"
 "    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:850
 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:1027
+#: g10/keygen.c:852
 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:1030
+#: g10/keygen.c:855
 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"
 
@@ -1516,12 +1473,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:1041
+#: g10/keygen.c:866
 #, 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:1046
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1529,29 +1486,25 @@ msgstr ""
 "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
 "2048 bitten fazlası tavsiye edilmez.\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Bu anahtar uzunluÄŸunu istediÄŸinizden emin misiniz? "
 
-#: 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: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:1059
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ä°stenen anahtar uzunluÄŸu: %u bit\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1567,7 +1520,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1583,30 +1536,30 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:985
 #, 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:1167
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s %s sonra geçersiz olacak\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1614,15 +1567,14 @@ 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:1178
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Bu doÄŸru mu? (e/h)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1046
 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) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -1634,44 +1586,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1070
 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:1253
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1682,29 +1634,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1136
 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:1316
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1151
 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:1327
+#: g10/keygen.c:1152
 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:1346
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1712,18 +1662,16 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keyedit.c:783 g10/keygen.c:1393
+#: g10/keyedit.c:701 g10/keygen.c:1218
 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:1394
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1225
 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 +1683,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1246
 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"
@@ -1743,58 +1691,57 @@ 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:1985
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:1972
 #, 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:2232
+#: g10/keygen.c:1979
 #, 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:2252
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2253
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "anahtar son derece güvenli olarak imlendi.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2011
 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"
@@ -1802,117 +1749,97 @@ 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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2023 g10/keygen.c:2131
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:2320 g10/sig-check.c:223 g10/sign.c:257
+#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
 #, 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:2322 g10/sig-check.c:225 g10/sign.c:259
+#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
 #, 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:2331
+#: g10/keygen.c:2078
 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:2360
+#: g10/keygen.c:2107
 msgid "Really create? "
 msgstr "Gerçekten oluşturulsun mu? "
 
-#: g10/decrypt.c:92 g10/encode.c:673
+#: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/encode.c:126 g10/encode.c:351
+#: g10/encode.c:92 g10/encode.c:296
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:134 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
-#: g10/tdbio.c:552
+#: g10/encode.c:100 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:162 g10/sign.c:1035
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:236 g10/encode.c:447
+#: g10/encode.c:185 g10/encode.c:383
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: UYARI: dosya boÅŸ\n"
 
-#: g10/encode.c:340
+#: g10/encode.c:285
 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:368
+#: g10/encode.c:313
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:402
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:347
+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:413 g10/encode.c:567
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
-
-#: g10/encode.c:485 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:646
+#: g10/encode.c:563
 #, 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/keyedit.c:2211
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:164
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloÄŸu okunurken hata: %s\n"
 
-#: g10/export.c:172
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "%08lX anahtarı: bir RFC2440 anahtarı değil - atlandı\n"
 
-#: g10/export.c:188
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:196
+#: g10/export.c:188
 #, 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:279
+#: g10/export.c:255
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
@@ -1922,23 +1849,21 @@ 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:2383
+#: g10/getkey.c:187 g10/getkey.c:2272
 msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1360
 #, 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:2100
+#: g10/getkey.c:1989
 #, 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:2147
+#: g10/getkey.c:2036
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
@@ -2018,187 +1943,177 @@ msgstr "  gizli anahtarlar indirildi: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar deÄŸiÅŸmedi: %lu\n"
 
-#: g10/import.c:479
-#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
-
-#: g10/import.c:527 g10/import.c:756
+#: g10/import.c:438 g10/import.c:657
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/import.c:544
+#: g10/import.c:455
 #, 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:551
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
 
-#: g10/import.c:553
+#: g10/import.c:464
 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:563 g10/import.c:825
+#: g10/import.c:474 g10/import.c:726
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:568
+#: g10/import.c:479
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 
-#: g10/import.c:578
+#: g10/import.c:489
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:583 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:587 g10/import.c:664 g10/import.c:776 g10/import.c:885
+#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluÅŸtu: %s\n"
 
-#: g10/import.c:596
-#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:505
+#, c-format
+msgid "key %08lX: public key imported\n"
 msgstr "anahtar %08lX: genel anahtar indirildi\n"
 
-#: g10/import.c:617
+#: g10/import.c:524
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "anahtar %08lX: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:634 g10/import.c:842
+#: g10/import.c:542 g10/import.c:743
 #, 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:641 g10/import.c:848
+#: g10/import.c:549 g10/import.c:749
 #, 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:673
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:579
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
 msgstr "anahtar %08lX: 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:676
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:582
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
 msgstr "anahtar %08lX: %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:679
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:585
+#, c-format
+msgid "key %08lX: 1 new signature\n"
 msgstr "anahtar %08lX: 1 yeni imza\n"
 
-#: g10/import.c:682
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:588
+#, c-format
+msgid "key %08lX: %d new signatures\n"
 msgstr "anahtar %08lX: %d yeni imza\n"
 
-#: g10/import.c:685
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:591
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
 msgstr "anahtar %08lX: bir yeni yardımcı anahtar\n"
 
-#: g10/import.c:688
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:594
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
 msgstr "anahtar %08lX: %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:700
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:604
+#, c-format
+msgid "key %08lX: not changed\n"
 msgstr "anahtar %08lX: deÄŸiÅŸmedi\n"
 
-#: g10/import.c:770
+#: g10/import.c:671
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:781
+#: g10/import.c:682
 #, 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:785
+#: g10/import.c:686
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:790
+#: g10/import.c:691
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 
-#: g10/import.c:819
+#: g10/import.c:720
 #, 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:859
+#: g10/import.c:760
 #, 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:891
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
 msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası indirildi\n"
 
-#: g10/import.c:928
+#: g10/import.c:826
 #, 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:941
+#: g10/import.c:839
 #, 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:943
+#: g10/import.c:841
 #, 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:960
+#: g10/import.c:858
 #, 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:970
+#: g10/import.c:868
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:971
+#: g10/import.c:869
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1001
+#: g10/import.c:899
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
 
-#: g10/import.c:1024
+#: g10/import.c:922
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
@@ -2207,132 +2122,106 @@ 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:1047
+#: g10/import.c:945
 #, 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:1056
+#: g10/import.c:954
 #, 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:1073
+#: g10/import.c:971
 #, 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:1174
+#: g10/import.c:1072
 #, 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:1233
+#: 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"
+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:1247
+#: 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"
+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:1304
-#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1201
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
 msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1335
+#: g10/import.c:1231
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
 
-#: g10/keyedit.c:143
+#: g10/keyedit.c:142
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:144
+#: g10/keyedit.c:143
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:215 g10/keylist.c:148
+#: g10/keyedit.c:214 g10/keylist.c:139
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:217 g10/keylist.c:150
+#: g10/keyedit.c:216 g10/keylist.c:141
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:219 g10/keylist.c:152
+#: g10/keyedit.c:218 g10/keylist.c:143
 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:221 g10/keylist.c:154
+#: g10/keyedit.c:220 g10/keylist.c:145
 #, 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:223 g10/keylist.c:156
+#: g10/keyedit.c:222 g10/keylist.c:147
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:158
+#: g10/keyedit.c:224 g10/keylist.c:149
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:226
 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:229
+#: g10/keyedit.c:228
 #, 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:356
+#: g10/keyedit.c:335
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:363 g10/keyedit.c:480 g10/keyedit.c:538 g10/keyedit.c:1136
+#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:371 g10/keyedit.c:486 g10/keyedit.c:1142
+#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:376
-#, c-format
-msgid "Warning: user ID \"%s\" is not self-signed.\n"
-msgstr ""
-
-#: g10/keyedit.c:395
-#, 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:404
-#, 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:418
+#: g10/keyedit.c:364
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2341,81 +2230,75 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:368
 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:442
+#: g10/keyedit.c:388
 #, 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:446
+#: g10/keyedit.c:393
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:405
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:420
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:440
 #, 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:498
+#: g10/keyedit.c:444
 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:531
-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: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:533
+#: g10/keyedit.c:479
 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:556
+#: g10/keyedit.c:500
 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:560
+#: g10/keyedit.c:504
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:506
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:508
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:510
 #, 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:591
+#: g10/keyedit.c:535
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2423,32 +2306,7 @@ msgstr ""
 "Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:600
-#, 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:604
-#, 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:609
-#, 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:616
+#: g10/keyedit.c:544
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2456,7 +2314,7 @@ msgstr ""
 "\n"
 "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:548
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2464,7 +2322,7 @@ msgstr ""
 "\n"
 "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:625
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2472,7 +2330,7 @@ msgstr ""
 "\n"
 "Her şeyiyle bu anahtarı kontol edemedim.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:557
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2480,7 +2338,7 @@ msgstr ""
 "\n"
 "Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:561
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2488,33 +2346,33 @@ msgstr ""
 "\n"
 "Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:569
 msgid "Really sign? "
 msgstr "Gerçekten imzalayacak mısınız? "
 
-#: g10/keyedit.c:684 g10/keyedit.c:2980 g10/keyedit.c:3039 g10/sign.c:308
+#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:740
+#: g10/keyedit.c:658
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:662
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:666
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuÅŸ.\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:686
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:692
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2522,7 +2380,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:706
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2530,581 +2388,553 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:709
 msgid "Do you really want to do this? "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:855
+#: g10/keyedit.c:773
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:897
+#: g10/keyedit.c:815
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/keyedit.c:898
+#: g10/keyedit.c:816
 msgid "q"
 msgstr "k"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save"
 msgstr "kaydet"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:817
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "help"
 msgstr "yardım"
 
-#: g10/keyedit.c:900
+#: g10/keyedit.c:818
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "fpr"
 msgstr "piz"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:820
 msgid "show fingerprint"
 msgstr "parmak izini göster"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list"
 msgstr "listele"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:821
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini göster"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:822
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "uid"
 msgstr "kullkim"
 
-#: g10/keyedit.c:905
+#: g10/keyedit.c:823
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "key"
 msgstr "anahtar"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:824
 msgid "select secondary key N"
 msgstr "N yardımcı anahtarını seçer"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "check"
 msgstr "kontrol"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:825
 msgid "list signatures"
 msgstr "imzaları listele"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:826
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign"
 msgstr "imzala"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:827
 msgid "sign the key"
 msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:828
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "lsign"
 msgstr "yimza"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:829
 msgid "sign the key locally"
 msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "nrsign"
 msgstr "yksızimza"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:830
 msgid "sign the key non-revocably"
 msgstr "yürürlükten kaldırılamayan imza"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "nrlsign"
 msgstr "içyksızimza"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:831
 msgid "sign the key locally and non-revocably"
 msgstr "yürürlükten kaldırılamayan yerel imza"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:832
 msgid "debug"
 msgstr "hata ayıklama"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "adduid"
 msgstr "kullkimEkle"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:833
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "addphoto"
 msgstr "fotoekle"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:834
 msgid "add a photo ID"
 msgstr "bir foto kimliÄŸi ekler"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "deluid"
 msgstr "kullkimSil"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:835
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:919
+#: g10/keyedit.c:837
 msgid "delphoto"
 msgstr "fotosil"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "addkey"
 msgstr "anhEkle"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:838
 msgid "add a secondary key"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delkey"
 msgstr "anhSil"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:839
 msgid "delete a secondary key"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "addrevoker"
-msgstr "anhEkle"
-
-#: g10/keyedit.c:922
-#, fuzzy
-msgid "add a revocation key"
-msgstr "bir yardımcı anahtar ekler"
-
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delsig"
 msgstr "imzaSil"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:840
 msgid "delete signatures"
 msgstr "imzaları siler"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "expire"
 msgstr "sontarih"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:841
 msgid "change the expire date"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "primary"
 msgstr "asıl"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:842
 msgid "flag user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle"
 msgstr "seçmece"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:843
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:845
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "pref"
 msgstr "önayar"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:846
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "showpref"
 msgstr "tercihgöst"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:847
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "setpref"
 msgstr "tercihyap"
 
-#: g10/keyedit.c:931
+#: g10/keyedit.c:848
 msgid "set preference list"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updpref"
 msgstr "tercgüncel"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:849
 msgid "updated preferences"
 msgstr "güncelenmiş tercihler"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "passwd"
 msgstr "aparola"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:850
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "trust"
 msgstr "güvence"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:851
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revsig"
 msgstr "imzayürkal"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:852
 msgid "revoke signatures"
 msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revkey"
 msgstr "yürkalanh"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:853
 msgid "revoke a secondary key"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable"
 msgstr "iptal"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:854
 msgid "disable a key"
 msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable"
 msgstr "kullan"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:855
 msgid "enable a key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "showphoto"
 msgstr "fotogöst"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:856
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/delkey.c:112 g10/keyedit.c:959
+#: g10/delkey.c:112 g10/keyedit.c:876
 msgid "can't do that in batchmode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:913
 #, 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:1014
+#: g10/keyedit.c:931
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:962
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:994
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:998
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1047
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1066
 msgid "Really sign all user IDs? "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1067
 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:1175
+#: g10/keyedit.c:1092
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1195 g10/keyedit.c:1216
+#: g10/keyedit.c:1112 g10/keyedit.c:1133
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1114
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1117
 msgid "Really remove all selected user IDs? "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1118
 msgid "Really remove this user ID? "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1239 g10/keyedit.c:1270
+#: g10/keyedit.c:1156 g10/keyedit.c:1178
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1160
 msgid "Do you really want to delete the selected keys? "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1161
 msgid "Do you really want to delete this key? "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1182
 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:1275
+#: g10/keyedit.c:1183
 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:1344
+#: g10/keyedit.c:1252
 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:1346
+#: g10/keyedit.c:1254
 msgid "Really update the preferences? "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1292
 msgid "Save changes? "
 msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1295
 msgid "Quit without saving? "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1306
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1313
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1320
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1332
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
-#: g10/keyedit.c:1740
-#, 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: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:1744
+#: g10/keyedit.c:1492
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:1750 g10/keyedit.c:1776
+#: g10/keyedit.c:1497 g10/keyedit.c:1523
 #, 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:1759
+#: g10/keyedit.c:1506
 #, c-format
 msgid " trust: %c/%c"
 msgstr " güven derecesi: %c/%c"
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1510
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmiÅŸti"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1539
 #, 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:1795
+#: g10/keyedit.c:1542
 msgid "rev- faked revocation found\n"
 msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1544
 #, 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:1827
-msgid "There are no preferences on a PGP 2.x-style key.\n"
-msgstr ""
-
-#: g10/keyedit.c:1835
-#, fuzzy
+#: g10/keyedit.c:1574
 msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
+"Please note that the shown key validity is not necessary 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:1923
+#: g10/keyedit.c:1660
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
-"versions\n"
-"         of PGP to reject this key.\n"
+"WARNING: This key already has a photo ID.\n"
+"         Adding another photo ID may confuse some versions of PGP.\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"
+"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:1928
+#: 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:1934
+#: 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
+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 ""
+"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
 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:2069
+#: g10/keyedit.c:1832
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:1842
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:1846
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:1852
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:1866
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:1867
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:1870
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:2203
-#, fuzzy
-msgid "Enter the user ID of the designated revoker: "
-msgstr "Anahtar uzunluÄŸunu giriniz"
-
-#: g10/keyedit.c:2218
-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
-msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-
-#: g10/keyedit.c:2314
+#: g10/keyedit.c:1943
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:1949
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:1953
 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:2326
+#: g10/keyedit.c:1955
 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:2368
+#: g10/keyedit.c:1997
 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:2384
+#: g10/keyedit.c:2013
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:2467
+#: g10/keyedit.c:2096
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:2504 g10/keyedit.c:2611
-#, 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:2671
+#: g10/keyedit.c:2284
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:2717
+#: g10/keyedit.c:2330
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2444
 msgid "user ID: \""
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:2836
+#: g10/keyedit.c:2449
 #, c-format
 msgid ""
 "\"\n"
@@ -3113,7 +2943,7 @@ msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2452
 #, c-format
 msgid ""
 "\"\n"
@@ -3122,250 +2952,236 @@ msgstr ""
 "\"\n"
 "%08lX anahtarınızla %s de yerel olarak imzalı\n"
 
-#: g10/keyedit.c:2844
+#: g10/keyedit.c:2457
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2461
 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:2852
+#: g10/keyedit.c:2465
 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:2877
+#: g10/keyedit.c:2490
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:2891
+#: g10/keyedit.c:2504
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2512
 #, 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:2919
+#: g10/keyedit.c:2532
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:2929
+#: g10/keyedit.c:2542
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2544
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:2551
 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:2968
+#: g10/keyedit.c:2581
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:2730
 #, 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: "
-
-#: g10/keylist.c:93
+#. This isn't UTF8 as it is a URL(?)
+#: g10/keylist.c:87
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:759 g10/mainproc.c:768
+#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
 
-#: g10/keylist.c:127
-#, fuzzy
-msgid "Critical signature notation: "
-msgstr "imza niteleyici: "
-
-#: g10/keylist.c:129
+#. This is UTF8
+#: g10/keylist.c:120
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:127
 msgid "not human readable"
 msgstr "insan okuyabilir deÄŸil"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:216
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
 #. of subkey
-#: g10/keylist.c:476 g10/mainproc.c:895
+#: g10/keylist.c:423 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:952
+#: g10/keylist.c:889
 msgid "Fingerprint:"
 msgstr " 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:958
+#: g10/keylist.c:895
 msgid "             Fingerprint:"
 msgstr "              Parmak izi:"
 
-#: g10/keylist.c:962
+#: g10/keylist.c:899
 msgid "     Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
 
-#: g10/encr-data.c:66 g10/mainproc.c:281
+#: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ÅŸifreli veri\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:283
+#: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile ÅŸifrelenmiÅŸ\n"
 
-#: g10/mainproc.c:311
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "genel anahtar: %08lX\n"
 
-#: g10/mainproc.c:357
+#: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla ÅŸifreli veri: doÄŸru DEK\n"
 
-#: g10/mainproc.c:409
+#: g10/mainproc.c:378
 #, 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:419
+#: g10/mainproc.c:388
 #, 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:433
+#: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:460 g10/mainproc.c:479
+#: g10/mainproc.c:429 g10/mainproc.c:448
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:467
+#: g10/mainproc.c:436
 #, 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:497
+#: g10/mainproc.c:466
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:502
+#: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: ÅŸifreli ileti tahrip edilmiÅŸ!\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:495
 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:528
+#: g10/mainproc.c:497
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:703
+#: g10/mainproc.c:672
 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:771
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Niteleme: "
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Güvence: "
 
-#: g10/mainproc.c:1238
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "imza doÄŸrulama engellendi\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1280 g10/mainproc.c:1290
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1301
+#: g10/mainproc.c:1261
 #, 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:1345 g10/mainproc.c:1367
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "KÖTÜ imza: \""
 
-#: g10/mainproc.c:1346 g10/mainproc.c:1368
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Kullanım tarihi geçmiş imza: \""
 
-#: g10/mainproc.c:1347 g10/mainproc.c:1369
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "DoÄŸru imza: \""
 
-#: g10/mainproc.c:1371
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1391
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                den \""
 
-#: g10/mainproc.c:1452
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ä°mza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1521 g10/mainproc.c:1537 g10/mainproc.c:1599
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1548
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1612
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -3380,52 +3196,34 @@ 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:386
+#: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Uyarı: %s \"%s\" de güvensiz sahiplik\n"
 
-#: g10/misc.c:418
+#: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Uyarı: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/misc.c:443
+#: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA ÅŸifre eklentisi yok\n"
 
-#: g10/misc.c:444
-msgid ""
-"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:436
+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/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
+#: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:1057
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -3566,39 +3364,34 @@ msgstr "imzalı veri yok\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/pubkey-enc.c:101
+#: g10/pubkey-enc.c:100
 #, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anonim alıcı: %08lX gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:158
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:177
 #, 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:221
+#: g10/pubkey-enc.c:220
 #, 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:243
+#: g10/pubkey-enc.c:242
 #, 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"
 
-#: 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"
-
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
 #, c-format
@@ -3625,16 +3418,12 @@ msgstr "\"%s\" adresine gönderme işlemi başarılı (durum=%u)\n"
 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:283
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:493
+#: g10/hkp.c:471
 #, 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:543
+#: g10/hkp.c:521
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "anahtar sunucusu aranamıyor: %s\n"
@@ -3659,19 +3448,14 @@ 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"
+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
@@ -3693,61 +3477,46 @@ msgstr "BİLGİ: %08lX imza anahtarının kullanım süresi %s tarihinde dolmuş
 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: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
+#: g10/sign.c:115
 #, 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:303
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s imza: %s den\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\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: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:665 g10/sign.c:892
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: 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
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:876
+#: g10/sign.c:796
 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:1029
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -3831,8 +3600,7 @@ 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"
@@ -3889,8 +3657,7 @@ 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
@@ -3958,9 +3725,7 @@ 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 ""
@@ -3977,29 +3742,27 @@ 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:129 g10/skclist.c:185
+#: g10/skclist.c:110 g10/skclist.c:166
 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:157
+#: g10/skclist.c:138
 #, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:149
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:179
+#: g10/skclist.c:160
 #, 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"
@@ -4049,12 +3812,10 @@ 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
@@ -4068,9 +3829,7 @@ 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"
@@ -4125,8 +3884,7 @@ 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"
 
@@ -4143,8 +3901,7 @@ 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
@@ -4156,8 +3913,7 @@ 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"
@@ -4175,8 +3931,7 @@ 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"
@@ -4197,23 +3952,15 @@ msgstr ""
 "olduğundan RFC2440 standardında tanımlı olmalarına rağmen tavsiye\n"
 "edilmezler."
 
-#: 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
+#: g10/helptext.c:99
 msgid "Enter the size of the key"
 msgstr "Anahtar uzunluÄŸunu giriniz"
 
-#: 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
+#: 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
 msgid "Answer \"yes\" or \"no\""
 msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:113
 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"
@@ -4224,20 +3971,19 @@ 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:131
+#: g10/helptext.c:125
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:130
 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:140
+#: g10/helptext.c:134
 msgid "Please enter an optional comment"
 msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:139
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4251,46 +3997,36 @@ msgstr ""
 "D anahtar üretimine Devam etmek için.\n"
 "K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:148
 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:162
+#: g10/helptext.c:156
 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\"."
@@ -4313,15 +4049,14 @@ 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:200
+#: g10/helptext.c:194
 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:204
+#: g10/helptext.c:198
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4329,11 +4064,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:209
+#: g10/helptext.c:203
 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:214
+#: g10/helptext.c:208
 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"
@@ -4343,7 +4078,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:219
+#: g10/helptext.c:213
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4355,13 +4090,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:225
+#: g10/helptext.c:219
 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:229
+#: g10/helptext.c:223
 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"
@@ -4374,7 +4109,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:237
+#: g10/helptext.c:231
 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"
@@ -4384,23 +4119,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:244
+#: g10/helptext.c:238
 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:250
+#: g10/helptext.c:244
 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:254
+#: g10/helptext.c:248
 msgid "Give the name of the file to which the signature applies"
 msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:253
 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:264
+#: g10/helptext.c:258
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4408,7 +4143,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:270
+#: g10/helptext.c:264
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4436,7 +4171,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:286
+#: g10/helptext.c:280
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4446,11 +4181,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:301
+#: g10/helptext.c:295
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:303
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
@@ -4513,29 +4248,6 @@ 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 "Are you sure you still want to sign it?\n"
 #~ msgstr "Onu yine de imzalamak istiyor musunuz?\n"