Fixed agent access for gpg.

1 files changed, 187 insertions, 188 deletions

diff --git a/po/gl.po b/po/gl.po
index df536d204..5cf454e47 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2006-09-27 17:44+0200\n"
+"POT-Creation-Date: 2006-10-04 11:35+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -71,7 +71,7 @@ msgstr "contrasinal erróneo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1018 g10/keygen.c:3045
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1014 g10/keygen.c:3045
 #: g10/keygen.c:3075 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:265
 #: g10/openfile.c:358 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
 #, c-format
@@ -80,8 +80,8 @@ msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:193
-#: g10/encode.c:485 g10/gpg.c:1019 g10/gpg.c:3484 g10/import.c:195
-#: g10/keygen.c:2553 g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
+#: g10/encode.c:485 g10/gpg.c:1015 g10/import.c:195 g10/keygen.c:2553
+#: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
 #: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
@@ -198,7 +198,7 @@ msgstr ""
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:113 g10/gpg.c:466 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:113 g10/gpg.c:463 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
@@ -325,30 +325,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:925 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:921 scd/scdaemon.c:262 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1787
+#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1781
 #: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1986 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1980 scd/scdaemon.c:431 sm/gpgsm.c:869
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
 
-#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1990
+#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1984
 #: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opcións `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1997 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1991 scd/scdaemon.c:444 sm/gpgsm.c:880
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opcións de `%s'\n"
@@ -1164,7 +1164,7 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3846 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:162 g10/gpg.c:3802 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -1291,22 +1291,22 @@ msgstr "non se pode empregar %s no modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:265
+#: g10/encr-data.c:70 g10/mainproc.c:265
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:71 g10/mainproc.c:269
+#: g10/encr-data.c:72 g10/mainproc.c:269
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/encr-data.c:108 sm/decrypt.c:128
+#: g10/encr-data.c:110 sm/decrypt.c:128
 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:119
+#: g10/encr-data.c:122
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
@@ -1476,7 +1476,7 @@ msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave pública - omitida\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:364 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1484,128 +1484,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:366
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:367
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:371 sm/gpgsm.c:246
+#: g10/gpg.c:368 sm/gpgsm.c:246
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:369 sm/gpgsm.c:247
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:248
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar só con cifrado simétrico"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:373 sm/gpgsm.c:249
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:250
+#: g10/gpg.c:375 sm/gpgsm.c:250
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:380 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:252
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:379
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:380
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:381 sm/gpgsm.c:256
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:385 sm/gpgsm.c:254
+#: g10/gpg.c:382 sm/gpgsm.c:254
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:386 sm/gpgsm.c:257
+#: g10/gpg.c:383 sm/gpgsm.c:257
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:384
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro público"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:386
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:387
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:388
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:389
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:390
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:392
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:396 sm/gpgsm.c:259
+#: g10/gpg.c:393 sm/gpgsm.c:259
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:260
+#: g10/gpg.c:394 sm/gpgsm.c:260
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:396
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:398
 msgid "update all keys from a keyserver"
 msgstr "actualizar tódalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:402
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:405
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:406
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:407
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:418
+#: g10/gpg.c:415
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:422
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:429 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:426 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1616,47 +1616,47 @@ msgstr ""
 "Opcións:\n"
 " "
 
-#: g10/gpg.c:431 sm/gpgsm.c:280
+#: g10/gpg.c:428 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
-#: g10/gpg.c:433 sm/gpgsm.c:290
+#: g10/gpg.c:430 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:444 sm/gpgsm.c:326
+#: g10/gpg.c:441 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:445 sm/gpgsm.c:329
+#: g10/gpg.c:442 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:331
+#: g10/gpg.c:447 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usar modo de texto canónico"
 
-#: g10/gpg.c:464 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:461 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar coma ficheiro de saída"
 
-#: g10/gpg.c:477 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:474 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "non facer ningún cambio"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:475
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:517
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:521
+#: g10/gpg.c:518
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:546 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1664,7 +1664,7 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:549 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1684,17 +1684,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:745 g10/gpgv.c:96
+#: g10/gpg.c:741 g10/gpgv.c:96
 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/gpg.c:762
+#: g10/gpg.c:758
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:765
+#: g10/gpg.c:761
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1704,7 +1704,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:776 sm/gpgsm.c:530
+#: g10/gpg.c:772 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1712,560 +1712,556 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:779
+#: g10/gpg.c:775
 msgid "Pubkey: "
 msgstr "Pública: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2311
+#: g10/gpg.c:782 g10/keyedit.c:2311
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:793
+#: g10/gpg.c:789
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:800 g10/keyedit.c:2357
+#: g10/gpg.c:796 g10/keyedit.c:2357
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:884
+#: g10/gpg.c:880
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opcións] "
 
-#: g10/gpg.c:1056 sm/gpgsm.c:682
+#: g10/gpg.c:1050 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1074
+#: g10/gpg.c:1068
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definición do grupo \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1277
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1289
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1295
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1298
+#: g10/gpg.c:1292
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1301
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1307
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1310
+#: g10/gpg.c:1304
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1313
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1456
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1944
+#: g10/gpg.c:1938
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n"
 
-#: g10/gpg.c:2203 g10/gpg.c:2846 g10/gpg.c:2858
+#: g10/gpg.c:2196 g10/gpg.c:2839 g10/gpg.c:2851
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s non é para uso normal!\n"
 
-#: g10/gpg.c:2216
+#: g10/gpg.c:2209
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensión de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/gpg.c:2368 g10/gpg.c:2380
+#: g10/gpg.c:2361 g10/gpg.c:2373
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:2462
+#: g10/gpg.c:2455
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:2485 g10/gpg.c:2678 g10/keyedit.c:4065
+#: g10/gpg.c:2478 g10/gpg.c:2671 g10/keyedit.c:4065
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2497
+#: g10/gpg.c:2490
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:2500
+#: g10/gpg.c:2493
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2500
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2503
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2510
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2513
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2520
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2523
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2531
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2533
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2542
+#: g10/gpg.c:2535
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:2544
+#: g10/gpg.c:2537
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2541
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2543
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2545
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2547
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2549
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2551
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2565
+#: g10/gpg.c:2558
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2561
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2568
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2749
+#: g10/gpg.c:2742
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:2752
+#: g10/gpg.c:2745
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2835 sm/gpgsm.c:1235
+#: g10/gpg.c:2828 sm/gpgsm.c:1235
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2839
+#: g10/gpg.c:2832
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2848
+#: g10/gpg.c:2841
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/gpg.c:2851
+#: g10/gpg.c:2844
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2859
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2880
+#: g10/gpg.c:2873
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "só pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2879
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2885
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizacións) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:2905
+#: g10/gpg.c:2898
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 precísase da cifra IDEA\n"
 
-#: g10/gpg.c:2971 g10/gpg.c:2995 sm/gpgsm.c:1278
+#: g10/gpg.c:2964 g10/gpg.c:2988 sm/gpgsm.c:1278
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:2977 g10/gpg.c:3001 sm/gpgsm.c:1286
+#: g10/gpg.c:2970 g10/gpg.c:2994 sm/gpgsm.c:1286
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: g10/gpg.c:2983
+#: g10/gpg.c:2976
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:2989
+#: g10/gpg.c:2982
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
 
-#: g10/gpg.c:3004
+#: g10/gpg.c:2997
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:2999
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3001
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3010
+#: g10/gpg.c:3003
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3005
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3008
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3012
 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/gpg.c:3026
+#: g10/gpg.c:3019
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3028
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:3039
+#: g10/gpg.c:3032
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3036
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/gpg.c:3076
+#: g10/gpg.c:3069
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/gpg.c:3123
+#: g10/gpg.c:3116
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3128
+#: g10/gpg.c:3121
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3126
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3215
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3242
+#: g10/gpg.c:3226
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3237
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3244
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3246
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3256
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3269
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3271
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3290
+#: g10/gpg.c:3274
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3292
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3321
+#: g10/gpg.c:3305
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3336
+#: g10/gpg.c:3320
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3322
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3341
+#: g10/gpg.c:3325
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3345
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3354
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3379
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3387
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3391
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3428
+#: g10/gpg.c:3412
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3499
-msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
-
-#: g10/gpg.c:3541
+#: g10/gpg.c:3497
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3543
+#: g10/gpg.c:3499
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3545
+#: g10/gpg.c:3501
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3512
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3522
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3573
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3581
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/gpg.c:3715
+#: g10/gpg.c:3671
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:3832
+#: g10/gpg.c:3788
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3836
+#: g10/gpg.c:3792
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/gpg.c:4147
+#: g10/gpg.c:4103
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificación dado non é válido\n"
 
-#: g10/gpg.c:4149
+#: g10/gpg.c:4105
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4138
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@ -7816,6 +7812,9 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
+#~ msgid "-k[v][v][v][c] [user-id] [keyring]"
+#~ msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
+
 #, fuzzy
 #~ msgid "can't gen prime with pbits=%u qbits=%u\n"
 #~ msgstr "non se pode xerar un número primo de menos de %d bits\n"