diff --git a/NEWS b/NEWS
index 380fb0e4e..382fbcaba 100644
--- a/NEWS
+++ b/NEWS
@@ -649,7 +649,7 @@ Noteworthy changes in version 1.9.0 (2003-08-05)
 
 
  Copyright 2002, 2003, 2004, 2005, 2006, 2007,
-           2008  Free Software Foundation, Inc.
+           2008, 2009  Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 3376111cc..1166b0fef 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-08  Werner Koch  <wk@g10code.com>
+
+	* misc.c (has_invalid_email_chars): Let non-ascii pass through.
+
+	* cpr.c [USE_SHM_COPROCESSING]: Remove this code.
+
 2008-12-12  Werner Koch  <wk@g10code.com>
 
 	* passphrase.c (passphrase_get): Write a STATUS_ERROR.
diff --git a/g10/cpr.c b/g10/cpr.c
index 60cc97bf6..a20a811ff 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -357,10 +357,6 @@ cpr_enabled()
 {
     if( opt.command_fd != -1 )
 	return 1;
-#ifdef USE_SHM_COPROCESSING
-    if( opt.shm_coprocess )
-	return 1;
-#endif
     return 0;
 }
 
@@ -371,10 +367,6 @@ cpr_get_no_help( const char *keyword, const char *prompt )
 
     if( opt.command_fd != -1 )
 	return do_get_from_fd ( keyword, 0, 0 );
-#ifdef USE_SHM_COPROCESSING
-    if( opt.shm_coprocess )
-	return do_shm_get( keyword, 0, 0 );
-#endif
     for(;;) {
 	p = tty_get( prompt );
         return p;
@@ -388,10 +380,6 @@ cpr_get( const char *keyword, const char *prompt )
 
     if( opt.command_fd != -1 )
 	return do_get_from_fd ( keyword, 0, 0 );
-#ifdef USE_SHM_COPROCESSING
-    if( opt.shm_coprocess )
-	return do_shm_get( keyword, 0, 0 );
-#endif
     for(;;) {
 	p = tty_get( prompt );
 	if( *p=='?' && !p[1] && !(keyword && !*keyword)) {
@@ -424,10 +412,6 @@ cpr_get_hidden( const char *keyword, const char *prompt )
 
     if( opt.command_fd != -1 )
 	return do_get_from_fd ( keyword, 1, 0 );
-#ifdef USE_SHM_COPROCESSING
-    if( opt.shm_coprocess )
-	return do_shm_get( keyword, 1, 0 );
-#endif
     for(;;) {
 	p = tty_get_hidden( prompt );
 	if( *p == '?' && !p[1] ) {
@@ -444,10 +428,6 @@ cpr_kill_prompt(void)
 {
     if( opt.command_fd != -1 )
 	return;
-#ifdef USE_SHM_COPROCESSING
-    if( opt.shm_coprocess )
-	return;
-#endif
     tty_kill_prompt();
     return;
 }
@@ -460,10 +440,6 @@ cpr_get_answer_is_yes( const char *keyword, const char *prompt )
 
     if( opt.command_fd != -1 )
 	return !!do_get_from_fd ( keyword, 0, 1 );
-#ifdef USE_SHM_COPROCESSING
-    if( opt.shm_coprocess )
-	return !!do_shm_get( keyword, 0, 1 );
-#endif
     for(;;) {
 	p = tty_get( prompt );
 	trim_spaces(p); /* it is okay to do this here */
@@ -488,10 +464,6 @@ cpr_get_answer_yes_no_quit( const char *keyword, const char *prompt )
 
     if( opt.command_fd != -1 )
 	return !!do_get_from_fd ( keyword, 0, 1 );
-#ifdef USE_SHM_COPROCESSING
-    if( opt.shm_coprocess )
-	return !!do_shm_get( keyword, 0, 1 );
-#endif
     for(;;) {
 	p = tty_get( prompt );
 	trim_spaces(p); /* it is okay to do this here */
@@ -520,10 +492,6 @@ cpr_get_answer_okay_cancel (const char *keyword,
 
   if( opt.command_fd != -1 )
     answer = do_get_from_fd ( keyword, 0, 0 );
-#ifdef USE_SHM_COPROCESSING
-  else if( opt.shm_coprocess )
-    answer = do_shm_get( keyword, 0, 0 );
-#endif
 
   if (answer)
     {
diff --git a/g10/keygen.c b/g10/keygen.c
index d60578640..6a37471cb 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1958,6 +1958,11 @@ ask_user_id( int mode )
 
     if ( !mode )
       {
+        /* TRANSLATORS: This is the new string telling the user what
+           gpg is now going to do (i.e. ask for the parts of the user
+           ID).  Note that if you do not tyranslated this string, a
+           different string will be used used, which might still have
+           a correct transaltion.  */
 	const char *s1 =
           N_("\n"
              "GnuPG needs to construct a user ID to identify your key.\n"
@@ -1970,6 +1975,10 @@ ask_user_id( int mode )
                the old info text.  gettext has no way to tell whether
                a translation is actually available, thus we need to
                to compare again. */
+            /* TRANSLATORS: This string is in general not anymore used
+               but you should keep your existing translation.  In case
+               the new string is not translated this old string will
+               be used. */
             const char *s3 = N_("\n"
 "You need a user ID to identify your key; "
                                         "the software constructs the user ID\n"
diff --git a/g10/misc.c b/g10/misc.c
index cbaee08b5..5325faab9 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -1248,6 +1248,17 @@ unescape_percent_string (const unsigned char *s)
 }
 
 
+/* Check whether the string has characters not valid in an RFC822
+   address.  To cope with OpenPGP we ignore allow non-ascii characters
+   so that for example umlauts are legal in an email address.  An
+   OpenPGP user ID must be utf-8 encoded and tehre is no strict
+   requirement for RFC-822.  Thus to avoid IDNA encoding we put the
+   address verbatim as utf-8 into the user ID under the assumtiopn
+   that mail programs etc handle IDNA at a lower level and take
+   OpenPGP user IDS as utf-8.  Note that we can't do an utf-8 encoding
+   checking here becuase in keygen.c this function is called with the
+   native encoding and native to utf-8 encoding is done only after
+   checking. */
 int
 has_invalid_email_chars (const char *s)
 {
@@ -1257,8 +1268,8 @@ has_invalid_email_chars (const char *s)
 
   for ( ; *s; s++ ) 
     {
-      if ( *s & 0x80 )
-        return 1;
+      if ( (*s & 0x80) )
+        continue; /* We only care about ASCII.  */
       if ( *s == '@' )
         at_seen=1;
       else if ( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) )
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 22133f410..8b2a9f412 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -1107,7 +1107,7 @@ strusage( int level )
       break;
     case 11: p = "foo"; break;
     case 13: p = "0.0"; break;
-    case 14: p = "Copyright (C) 2008 Free Software Foundation, Inc."; break;
+    case 14: p = "Copyright (C) 2009 Free Software Foundation, Inc."; break;
     case 15: p =
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n";
diff --git a/po/ChangeLog b/po/ChangeLog
index 508844c61..a01605823 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-07  Jaime Suárez <jsuarez@mundocripto.com>  (wk)
+
+	* es.po: Update.
+
 2009-01-05  Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>  (wk)
 
 	* tr.po: Update.
diff --git a/po/es.po b/po/es.po
index d95fff7e4..f32ec2e40 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,14 +4,15 @@
 #  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 <jsuarez@ono.com>, 2001-2008.
+#
+# Jaime Suárez <jsuarez@mundocripto.com>, 2001-2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-01-05 19:29+0100\n"
-"PO-Revision-Date: 2008-05-27 22:38+0100\n"
+"POT-Creation-Date: 2008-12-09 12:09+0100\n"
+"PO-Revision-Date: 2008-12-14 19:34+0100\n"
 "Last-Translator: Jaime Suárez <jaime@mundocripto.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -111,8 +112,8 @@ msgstr "Frase contrase
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de más de %d bits\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3248
+#: g10/keygen.c:3281 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
 #, c-format
@@ -121,12 +122,12 @@ msgstr "no se puede crear %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2743
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2733
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -198,21 +199,19 @@ msgstr "PIN del Administrador"
 
 #: agent/divert-scd.c:224
 msgid "Reset Code"
-msgstr ""
+msgstr "Código de Reinicio"
 
 #: agent/divert-scd.c:284
-#, fuzzy
 msgid "Repeat this Reset Code"
-msgstr "Repita este PIN"
+msgstr "Repita este Código de Reinicio"
 
 #: agent/divert-scd.c:285
 msgid "Repeat this PIN"
 msgstr "Repita este PIN"
 
 #: agent/divert-scd.c:290
-#, fuzzy
 msgid "Reset Code not correctly repeated; try again"
-msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
+msgstr "Código de Reinicio repetido incorrectamente; inténtelo de nuevo"
 
 #: agent/divert-scd.c:291
 msgid "PIN not correctly repeated; try again"
@@ -413,7 +412,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHERO|escribir variables de entorno también en FICHERO"
 
 #: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:241 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:180
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <"
@@ -430,30 +429,30 @@ msgstr ""
 "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por GnuPG\n"
 
-#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:640
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuración `%s` no es válido\n"
 
 #: agent/gpg-agent.c:557 agent/protect-tool.c:1067 kbx/kbxutil.c:429
-#: scd/scdaemon.c:385 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: scd/scdaemon.c:385 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: agent/gpg-agent.c:656 g10/gpg.c:2086 scd/scdaemon.c:466 sm/gpgsm.c:971
+#: agent/gpg-agent.c:656 g10/gpg.c:2086 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
 #: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2090
-#: scd/scdaemon.c:471 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:479 sm/gpgsm.c:982
+#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
@@ -548,27 +547,27 @@ msgstr "manejador ssh 0x%lx para el descriptor %d iniciado\n"
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1860 scd/scdaemon.c:1200
+#: agent/gpg-agent.c:1843 scd/scdaemon.c:1200
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select falló: %s - espero 1s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:1969 scd/scdaemon.c:1267
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1267
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:2097
+#: agent/gpg-agent.c:2084
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
 
-#: agent/gpg-agent.c:2108 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2095 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:2121 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2108 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -1140,23 +1139,21 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2924 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #: g10/card-util.c:83
-#, fuzzy
 msgid "This command is only available for version 2 cards\n"
-msgstr "Esta orden no se permite en modo %s.\n"
+msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
 
 #: g10/card-util.c:85 scd/app-openpgp.c:1849
-#, fuzzy
 msgid "Reset Code not or not anymore available\n"
-msgstr "clave pública no disponible"
+msgstr "No hay Código de Reinicio o ya no está disponible\n"
 
 #: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1597
+#: g10/keygen.c:1664 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Su elección: "
 
@@ -1330,7 +1327,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificación\n"
 
 #: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/keygen.c:1601 g10/keygen.c:1629 g10/keygen.c:1703 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
@@ -1412,7 +1409,7 @@ msgstr "verificar PIN y listar todos los datos"
 
 #: g10/card-util.c:1415
 msgid "unblock the PIN using a Reset Code"
-msgstr ""
+msgstr "desbloquear PIN usando Código de Reinicio"
 
 #: g10/card-util.c:1537 g10/keyedit.c:1654
 msgid "Command> "
@@ -1716,14 +1713,13 @@ msgid "automatically retrieved `%s' via %s\n"
 msgstr "recuperado automáticamente `%s' vía %s\n"
 
 #: g10/getkey.c:1118
-#, fuzzy, c-format
+#,  c-format
 msgid "error retrieving `%s' via %s: %s\n"
-msgstr "error creando `%s': %s\n"
+msgstr "error recuperando `%s' vía %s: %s\n"
 
 #: g10/getkey.c:1120
-#, fuzzy
 msgid "No fingerprint"
-msgstr "Huella dactilar CA:"
+msgstr "No hay huella dactilar"
 
 #: g10/getkey.c:1930
 #, c-format
@@ -1758,14 +1754,12 @@ msgstr ""
 " "
 
 #: g10/gpg.c:372 sm/gpgsm.c:187
-#, fuzzy
 msgid "make a signature"
-msgstr "|[file]|crea una firma"
+msgstr "crea una firma"
 
 #: g10/gpg.c:373 sm/gpgsm.c:188
-#, fuzzy
 msgid "make a clear text signature"
-msgstr "|[file]|crea una firma en texto claro"
+msgstr "crea una firma en texto claro"
 
 #: g10/gpg.c:374 sm/gpgsm.c:189
 msgid "make a detached signature"
@@ -1876,9 +1870,8 @@ msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
 #: g10/gpg.c:431
-#, fuzzy
 msgid "print message digests"
-msgstr "imprime todos los resúmenes de mensaje"
+msgstr "imprime resúmenes de mensaje"
 
 #: g10/gpg.c:434 sm/gpgsm.c:210
 msgid "run in server mode"
@@ -1900,19 +1893,16 @@ msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
 #: g10/gpg.c:441 sm/gpgsm.c:241
-#, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|NOMBRE|cifra para NOMBRE"
+msgstr "|ID-USUARIO|cifra para ID-USUARIO"
 
 #: g10/gpg.c:454 sm/gpgsm.c:278
-#, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "usa este usuario para firmar o descifrar"
+msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
 
 #: g10/gpg.c:457
-#, fuzzy
 msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|nivel de compresión N (0 no comprime)"
+msgstr "|N|nivel de compresión N (0 desactiva)"
 
 #: g10/gpg.c:463
 msgid "use canonical text mode"
@@ -1984,7 +1974,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2012,7 +2002,7 @@ msgstr "Compresi
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
@@ -2270,7 +2260,7 @@ msgstr "%s:%d: lista de auto-localizaci
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2984 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
 
@@ -2310,11 +2300,11 @@ msgstr "debe usar ficheros (no tuber
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
@@ -2526,22 +2516,21 @@ msgstr "[nombre_fichero]"
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es válida\n"
 
 #: g10/gpgv.c:74
-#, fuzzy
 msgid "|FILE|take the keys from the keyring FILE"
-msgstr "tomar las claves de este anillo"
+msgstr "|FICHERO|tomar las claves del anillo FILE"
 
 # o tal vez "en el sello..."
 # Creo que es mejor "con el sello de fecha", no es un conflicto
@@ -3332,19 +3321,19 @@ msgstr ""
 "La clave tiene sólo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contraseña que cambiar.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3623
 msgid "This key is not protected.\n"
 msgstr "Esta clave no está protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3610 g10/revoke.c:538
 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:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3626
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3630
 msgid "Key is protected.\n"
 msgstr "La clave está protegida.\n"
 
@@ -3361,7 +3350,7 @@ msgstr ""
 "Introduzca la nueva frase contraseña para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2163
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo"
 
@@ -4093,54 +4082,54 @@ msgstr "demasiadas preferencias de resumen\n"
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresión\n"
 
-#: g10/keygen.c:406
+#: g10/keygen.c:405
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inválido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:888
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:931
+#: g10/keygen.c:930
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:988
+#: g10/keygen.c:987
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3133
+#: g10/keygen.c:1157 g10/keygen.c:1268 g10/keygen.c:1273 g10/keygen.c:1408
+#: g10/keygen.c:3123
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3139
+#: g10/keygen.c:1163 g10/keygen.c:1279 g10/keygen.c:1414 g10/keygen.c:3129
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1306
+#: g10/keygen.c:1305
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
 "tamaño\n"
 
-#: g10/keygen.c:1526
+#: g10/keygen.c:1525
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1529
+#: g10/keygen.c:1528
 msgid "Certify"
 msgstr "Certificar"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1531
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1535
+#: g10/keygen.c:1534
 msgid "Authenticate"
 msgstr "Autentificación"
 
@@ -4154,109 +4143,109 @@ msgstr "Autentificaci
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1553
+#: g10/keygen.c:1552
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1576
+#: g10/keygen.c:1575
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1580
+#: g10/keygen.c:1579
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1585
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1588
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1591
+#: g10/keygen.c:1590
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificación\n"
 
-#: g10/keygen.c:1594
+#: g10/keygen.c:1593
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1649 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1652
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firmar)\n"
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1654
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1657
+#: g10/keygen.c:1656
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrar)\n"
 
-#: g10/keygen.c:1658
+#: g10/keygen.c:1657
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sólo firmar)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1659
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sólo cifrar)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1731
+#: g10/keygen.c:1730
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendrá %u bits.\n"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1740
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1747 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿De qué tamaño quiere la clave? (%u) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1767 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1772 g10/keygen.c:1777 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1848
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4272,7 +4261,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1859
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4288,38 +4277,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1882
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1887
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave válida ¿durante? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1905 g10/keygen.c:1930
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1912
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1913
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1918
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1919
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1923
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4327,22 +4316,21 @@ msgstr ""
 "Su sistema no puede mostrar fechas más allá del 2038.\n"
 "Sin embargo funcionará correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1936
 msgid "Is this correct? (y/N) "
 msgstr "¿Es correcto? (s/n) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
+"\n"
+"GnuPG debe construir un ID de usuario para identificar su clave.\n"
+"\n"
 
-#. TRANSLATORS: This string is in general not anymore used
-#. but you should keep your existing translation.  In case
-#. the new string is not translated this old string will
-#. be used.
-#: g10/keygen.c:1982
+#: g10/keygen.c:1972
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4358,44 +4346,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:1991
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:1999
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2001
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2003
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2011
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2017
 msgid "Not a valid email address\n"
 msgstr "Dirección inválida\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2025
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2031
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido en el comentario\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2053
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2059
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4406,7 +4394,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2064
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la dirección de correo-e en el nombre real o en el "
@@ -4423,23 +4411,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2080
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2090
 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:2101
+#: g10/keygen.c:2091
 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:2120
+#: g10/keygen.c:2110
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2149
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4447,12 +4435,12 @@ msgstr ""
 "Necesita una frase contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2164
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2170
 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"
@@ -4464,7 +4452,7 @@ msgstr ""
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2194
 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"
@@ -4477,50 +4465,50 @@ msgstr ""
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3063 g10/keygen.c:3090
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3295 g10/keygen.c:3462
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave pública en `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3297 g10/keygen.c:3465
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3300 g10/keygen.c:3468
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3449
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo público de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3456
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3476
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo público `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3484
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3511
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3522
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4528,12 +4516,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este propósito.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3535 g10/keygen.c:3680 g10/keygen.c:3801
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3590 g10/keygen.c:3731 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4541,7 +4529,7 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3592 g10/keygen.c:3733 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4549,30 +4537,30 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3603 g10/keygen.c:3744
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3644 g10/keygen.c:3777
 msgid "Really create? (y/N) "
 msgstr "¿Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3950
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:3998
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4024
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
 
-#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
+#: g10/keyid.c:538 g10/keyid.c:550 g10/keyid.c:562 g10/keyid.c:574
 msgid "never     "
 msgstr "nunca     "
 
@@ -5207,7 +5195,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
 
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:295 g10/passphrase.c:587
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
@@ -5239,12 +5227,12 @@ msgstr "Introduzca frase contrase
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:370 g10/passphrase.c:431
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: %s\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5253,12 +5241,12 @@ msgstr ""
 "Necesita una frase contraseña para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
@@ -5839,17 +5827,17 @@ msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: la subclave de cifrado %s tiene un certificado cruzado inválido\n"
 
-#: g10/sig-check.c:211
+#: g10/sig-check.c:189
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clave pública %s es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:212
+#: g10/sig-check.c:190
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clave pública %s es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:223
+#: g10/sig-check.c:201
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5857,7 +5845,7 @@ msgstr ""
 "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:203
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5865,28 +5853,28 @@ msgstr ""
 "la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:235
+#: g10/sig-check.c:213
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: clave de la firma %s caducada el %s\n"
 
-#: g10/sig-check.c:248
-#, fuzzy, c-format
+#: g10/sig-check.c:226
+#,  c-format
 msgid "NOTE: signature key %s has been revoked\n"
-msgstr "NOTA: la clave ha sido revocada"
+msgstr "NOTA: la clave de firmado %s ha sido revocada\n"
 
-#: g10/sig-check.c:324
+#: g10/sig-check.c:302
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumiendo firma incorrecta de la clave %s por un bit crítico desconocido\n"
 
-#: g10/sig-check.c:590
+#: g10/sig-check.c:567
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "clave %s: no hay subclave para la firma de revocación de subclave\n"
 
-#: g10/sig-check.c:617
+#: g10/sig-check.c:594
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
@@ -6379,9 +6367,8 @@ msgid "invalid alias definition"
 msgstr "definición de alias inválida"
 
 #: jnlib/argparse.c:192
-#, fuzzy
 msgid "out of core"
-msgstr "[Error - core]"
+msgstr "memoria desbordada"
 
 #: jnlib/argparse.c:194
 msgid "invalid option"
@@ -6413,9 +6400,8 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "la orden \"%.50s\" es ambigua\n"
 
 #: jnlib/argparse.c:213
-#, fuzzy
 msgid "out of core\n"
-msgstr "[Error - core]"
+msgstr "memoria desbordada\n"
 
 #: jnlib/argparse.c:215
 #, c-format
@@ -6448,42 +6434,42 @@ msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "la conversión de `%s' en `%s' falló: %s\n"
 
 #: jnlib/dotlock.c:235
-#, fuzzy, c-format
+#, c-format
 msgid "failed to create temporary file `%s': %s\n"
-msgstr "no se puede crear el directorio temporal `%s': %s\n"
+msgstr "no se puede crear el fichero temporal `%s': %s\n"
 
 #: jnlib/dotlock.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "error writing to `%s': %s\n"
-msgstr "error escribiendo en %s: %s\n"
+msgstr "error escribiendo en `%s': %s\n"
 
 #: jnlib/dotlock.c:454
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
-msgstr ""
+msgstr "borrando fichero de bloqueo residual (creado por %d)\n"
 
 #: jnlib/dotlock.c:460
 msgid " - probably dead - removing lock"
-msgstr ""
+msgstr " - probablemente muerto - suprimiendo el bloqueo"
 
 #: jnlib/dotlock.c:470
-#, fuzzy, c-format
+#, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgstr "esperando al bloqueo (que mantiene %d%s) %s...\n"
 
 #: jnlib/dotlock.c:471
 msgid "(deadlock?) "
-msgstr ""
+msgstr "(¿bloqueo mutuo?)"
 
 #: jnlib/dotlock.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "lock `%s' not made: %s\n"
-msgstr "clave pública %s no encontrada: %s\n"
+msgstr "bloqueo `%s' no hecho: %s\n"
 
 #: jnlib/dotlock.c:502
-#, fuzzy, c-format
+#, c-format
 msgid "waiting for lock %s...\n"
-msgstr "escribiendo clave privada en `%s'\n"
+msgstr "esperando al bloqueo %s...\n"
 
 #: kbx/kbxutil.c:92
 msgid "set debugging flags"
@@ -6566,12 +6552,12 @@ msgstr "la respuesta no incluye el exponente p
 #: scd/app-openpgp.c:1417
 #, c-format
 msgid "using default PIN as %s\n"
-msgstr ""
+msgstr "usando PIN por defecto %s\n"
 
 #: scd/app-openpgp.c:1424
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
-msgstr ""
+msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
 
 #: scd/app-openpgp.c:1443
 #, c-format
@@ -6584,9 +6570,8 @@ msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
 
 #: scd/app-openpgp.c:1489
-#, fuzzy
 msgid "||Please enter the PIN"
-msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
+msgstr "||Por favor introduzca PIN"
 
 #: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
 #, c-format
@@ -6639,18 +6624,17 @@ msgid "|A|Admin PIN"
 msgstr "|A|PIN Administrador"
 
 #: scd/app-openpgp.c:1854
-#, fuzzy
 msgid "||Please enter the Reset Code for the card"
-msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
+msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
 
 #: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
-#, fuzzy, c-format
+#, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
-msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n"
+msgstr "Código de Reinicio demasiado corto; longitud mínima %d\n"
 
 #: scd/app-openpgp.c:1897
 msgid "|RN|New Reset Code"
-msgstr ""
+msgstr "|CR|Nuevo Código de Reinicio"
 
 #: scd/app-openpgp.c:1898
 msgid "|AN|New Admin PIN"
@@ -6746,9 +6730,8 @@ msgstr "no se puede acceder a %s - 
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
 #: scd/app-dinsig.c:526
-#, fuzzy
 msgid "|N|Initial New PIN"
-msgstr "|N|Nuevo PIN"
+msgstr "|N|Nuevo PIN Inicial"
 
 #: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
@@ -6759,9 +6742,8 @@ msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
 
 #: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
-#, fuzzy
 msgid "|FILE|write a log to FILE"
-msgstr "|FICHERO|escribir inform de auditoría a FICHERO"
+msgstr "|FICHERO|escribir log en FICHERO"
 
 #: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
@@ -6781,7 +6763,7 @@ msgstr "no usa el driverd del CCID interno"
 
 #: scd/scdaemon.c:136
 msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr ""
+msgstr "|N|desconectar la tarjeta después de N segundos de inactividad"
 
 #: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
@@ -6986,7 +6968,7 @@ msgstr "el certificado no se creo durante el tiempo de validez el emisor"
 #: sm/certchain.c:1084
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
-"certificado intermedio no creado durante el tiempo de validezdel emisor"
+"certificado intermedio no creado durante el tiempo de validez del emisor"
 
 #: sm/certchain.c:1088
 msgid "  (  signature created at "
@@ -7220,6 +7202,8 @@ msgid ""
 "To complete this certificate request please enter the passphrase for the key "
 "you just created once more.\n"
 msgstr ""
+"Para completar este certificado introduzca por favor la frase contraseña"
+"para la clave que acaba de crear una vez más.\n"
 
 #: sm/certreqgen-ui.c:122
 #, c-format
@@ -7316,9 +7300,8 @@ msgid "Ready.  You should now send this request to your CA.\n"
 msgstr "Acabado. Debería mandar esta petición a su CA.\n"
 
 #: sm/certreqgen-ui.c:303
-#, fuzzy
 msgid "resource problem: out of core\n"
-msgstr "problema de recursos: core agotado\n"
+msgstr "problema de recursos: memoria desbordada\n"
 
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
@@ -7464,19 +7447,16 @@ msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
 #: sm/gpgsm.c:297
-#, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
-msgstr "añade este anillo a la lista de anillos"
+msgstr "|FICHERO|añade este anillo a la lista de anillos"
 
 #: sm/gpgsm.c:300
-#, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
+msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
 
 #: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
-#, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SERVIDOR|usa este servidor de claves"
+msgstr "|ESPEC|usa este servidor para buscar claves"
 
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
@@ -7486,11 +7466,11 @@ msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgsm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7500,61 +7480,60 @@ msgstr ""
 "firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgsm [opciones] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:708
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "NOTA: no se podrá cifrar a `%s': %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:719
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "modelo de validación desconocido `%s'\n"
 
-#: sm/gpgsm.c:771
-#, fuzzy, c-format
+#: sm/gpgsm.c:770
+#, c-format
 msgid "%s:%u: no hostname given\n"
-msgstr "línea %d: falta nombre de entidad\n"
+msgstr "%s:%u: falta el nombre del host\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
-msgstr ""
+msgstr "%s:%u: se dio contraseña sin usuario\n"
 
-#: sm/gpgsm.c:811
-#, fuzzy, c-format
+#: sm/gpgsm.c:810
+#, c-format
 msgid "%s:%u: skipping this line\n"
-msgstr "  s = saltar esta clave\n"
+msgstr "%s:%u: omitir esta línea\n"
 
-#: sm/gpgsm.c:1325
-#, fuzzy
+#: sm/gpgsm.c:1322
 msgid "could not parse keyserver\n"
-msgstr "no se puede interpretar la URL del servidor de claves\n"
+msgstr "no se puede interpretar el servidor de claves\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecutándose con hora del sistema falsificada"
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importando certificados comunes `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no puedo firmar usando `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "esta orden no está aún implementada\n"
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
-msgstr ""
+msgstr "orden inválida (no hay orden implícita)\n"
 
 #: sm/import.c:109
 #, c-format
@@ -7632,9 +7611,8 @@ msgid "error storing flags: %s\n"
 msgstr "error almacenando parámetros: %s\n"
 
 #: sm/keylist.c:623
-#, fuzzy
 msgid "Error - "
-msgstr "[Error - Sin nombre]"
+msgstr "Error - "
 
 #: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
@@ -7686,14 +7664,14 @@ msgstr ""
 "¡Observe que este certificado NO creará una firma cualificada!"
 
 #: sm/sign.c:420
-#, fuzzy, c-format
+#, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
-msgstr "el algoritmo de protección %d%s no puede ser utilizado\n"
+msgstr "resumen %d (%s) para firmante %d no puede utilizarse; usando %s\n"
 
 #: sm/sign.c:433
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
-msgstr ""
+msgstr "algoritmo de hash usado para el firmante %d: %s (%s)\n"
 
 #: sm/sign.c:483
 #, c-format
@@ -7717,6 +7695,7 @@ msgstr "usando el certificado ID 0x%08lX\n"
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
+"firma inválida: el resumen del mensaje no coincide con el calculado\n"
 
 #: sm/verify.c:590
 msgid "Good signature from"
@@ -7891,7 +7870,7 @@ msgstr "|NOMBRE|cifra para el ususario NOMBRE tambi
 
 #: tools/gpgconf-comp.c:664
 msgid "|SPEC|set up email aliases"
-msgstr ""
+msgstr "|ESPEC|establecer alias de email"
 
 #: tools/gpgconf-comp.c:685
 msgid "Configuration for Keyservers"
@@ -7907,7 +7886,7 @@ msgstr "permitir b
 
 #: tools/gpgconf-comp.c:693
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
+msgstr "|MECANISMOS|usa MECANISMOS para encontrar claves por emails"
 
 #: tools/gpgconf-comp.c:738
 msgid "disable all access to the dirmngr"
@@ -7952,7 +7931,7 @@ msgstr "Configuraci
 #: tools/gpgconf-comp.c:3008
 #, c-format
 msgid "External verification of component %s failed"
-msgstr ""
+msgstr "Verificación externa del componente %s fallida"
 
 #: tools/gpgconf-comp.c:3158
 msgid "Note that group specifications are ignored\n"
@@ -7975,9 +7954,8 @@ msgid "|COMPONENT|change options"
 msgstr "|COMPONENTE|cambiar opciones"
 
 #: tools/gpgconf.c:64
-#, fuzzy
 msgid "|COMPONENT|check options"
-msgstr "|COMPONENTE|cambiar opciones"
+msgstr "|COMPONENTE|comprobar opciones"
 
 #: tools/gpgconf.c:66
 msgid "apply global default values"
@@ -7985,7 +7963,7 @@ msgstr "aplicar valores globales por defecto"
 
 #: tools/gpgconf.c:68
 msgid "get the configuration directories for gpgconf"
-msgstr ""
+msgstr "obtener directorios de configuración para gpgconf"
 
 #: tools/gpgconf.c:70
 msgid "list global configuration file"
diff --git a/scripts/mail-to-translators b/scripts/mail-to-translators
index 2894eea71..c01e89e59 100755
--- a/scripts/mail-to-translators
+++ b/scripts/mail-to-translators
@@ -5,6 +5,9 @@
 # remove the colon to armor this script.
 SENDMAIL=": /usr/sbin/sendmail"
 
+LC_ALL=C
+LC_CTYPE=C
+
 for file in *.po; do
     addr=$(head -100 $file | awk '/^# ?Designated-Translator:/ { printf "%s", $0; exit 0}' | sed 's/.*\(<.*>\).*/\1/')
     if [ -z "$addr" ]; then