19 files changed, 261 insertions, 242 deletions
diff --git a/TODO b/TODO
index ea4b33022..f3ee43892 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 
   * Add Dave's UTS patches
 
+  * Fix revoked subkey problem - see key 621cc013
+
   * Don't display the "no secret for decryption available"
 
   ** Check whether the use of -u and --clearsign created 2 signatures.
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 9b23e2124..c3260b69d 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -25,8 +25,10 @@
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
+#ifndef HAVE_DOSISH_SYSTEM
 #include <sys/socket.h>
 #include <sys/un.h>
+#endif
 #include <errno.h>
 
 #include "util.h"
@@ -151,6 +153,7 @@ read_passphrase_from_fd( int fd )
     fd_passwd = pw;
 }
 
+#ifndef HAVE_DOSISH_SYSTEM
 static int
 writen ( int fd, const void *buf, size_t nbytes )
 {
@@ -202,7 +205,6 @@ readn ( int fd, void *buf, size_t buflen, size_t *ret_nread )
     return 0;
 }
 
-
 /*
  * Open a connection to the agent and send the magic string
  * Returns: -1 on error or an filedescriptor for urther processing
@@ -263,7 +265,7 @@ agent_close ( int fd )
 {
     close (fd);
 }
-
+#endif /* !HAVE_DOSISH_SYSTEM */
 
 
 /*
@@ -275,6 +277,10 @@ agent_close ( int fd )
 static char *
 agent_get_passphrase ( u32 *keyid, int mode )
 {
+  #ifdef HAVE_DOSISH_SYSTEM
+    return NULL;
+  #else
+  
     size_t n;
     char *atext;
     char buf[50];
@@ -412,6 +418,7 @@ agent_get_passphrase ( u32 *keyid, int mode )
     free_public_key( pk );
 
     return NULL;
+  #endif
 }
 
 /*
@@ -420,6 +427,9 @@ agent_get_passphrase ( u32 *keyid, int mode )
 void
 passphrase_clear_cache ( u32 *keyid, int algo )
 {
+  #ifdef HAVE_DOSISH_SYSTEM
+    return ;
+  #else
     size_t n;
     char buf[50];
     int fd = -1;
@@ -473,6 +483,7 @@ passphrase_clear_cache ( u32 *keyid, int algo )
     if ( fd != -1 )
         agent_close (fd);
     free_public_key( pk );
+  #endif
 }
 
 
diff --git a/po/da.po b/po/da.po
index bdcd8511d..4285bc59a 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: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -2613,25 +2613,25 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2639,54 +2639,54 @@ msgid ""
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
diff --git a/po/de.po b/po/de.po
index 4371bfc65..936b78c91 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-10-15 14:30+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -2723,25 +2723,25 @@ msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2752,34 +2752,34 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie das Mantra nochmal ein: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2789,20 +2789,20 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
diff --git a/po/eo.po b/po/eo.po
index eb5a37051..76a9eeaec 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-08-16 23:19+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -2681,25 +2681,25 @@ msgstr "ne povas trakti publik�losilan metodon %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2710,34 +2710,34 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2747,20 +2747,20 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
diff --git a/po/es_ES.po b/po/es_ES.po
index bf0df4b1f..8a3163ac6 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -2714,25 +2714,25 @@ msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 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:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2743,35 +2743,35 @@ msgstr ""
 "Necesita una contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Introduzca contrase�a: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita contrase�a: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linea demasiado larga\n"
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2781,20 +2781,20 @@ msgstr ""
 "Necesita una contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Introduzca contrase�a: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Repita contrase�a: "
 
diff --git a/po/fr.po b/po/fr.po
index c25f25836..9a0529b7f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-06-28 18:41+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -2716,25 +2716,25 @@ msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cl� principale %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2745,34 +2745,34 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez le mot de passe: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2782,20 +2782,20 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
diff --git a/po/id.po b/po/id.po
index e66332a04..5c9a7997d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesia <[email protected]>\n"
@@ -2680,25 +2680,25 @@ msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2709,34 +2709,34 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2746,20 +2746,20 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
diff --git a/po/it.po b/po/it.po
index 07cf70041..b2be53f0f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 1999-12-08 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -2696,25 +2696,25 @@ msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2725,34 +2725,34 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2762,20 +2762,20 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
diff --git a/po/ja.po b/po/ja.po
index b23b5e53a..c3685a271 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-10-19 23:08+09:00\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -2713,25 +2713,25 @@ msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�縰ID %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2742,34 +2742,34 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2779,20 +2779,20 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
diff --git a/po/nl.po b/po/nl.po
index 1fe2d18aa..01a9c4484 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: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -2716,25 +2716,25 @@ msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hoofdsleutelnummer %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2745,34 +2745,34 @@ msgstr ""
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
 "sleutel voor gebruiker op te heffen: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Geef de sleuteltekst: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Herhaal de sleuteltekst: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2782,20 +2782,20 @@ msgstr ""
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
 "sleutel voor gebruiker op te heffen: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Geef de sleuteltekst: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
diff --git a/po/pl.po b/po/pl.po
index 092ec6f23..05ad56ffb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 1999-12-05 21:29+01:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -2726,27 +2726,27 @@ msgstr "algorytm klucza publicznego niemo�liwy do obs�u�enia: %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
 " \n"
 "(identyfikator g��wnego klucza %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2757,35 +2757,35 @@ msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
 "dla u�ytkownika: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linia za d�uga\n"
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2795,20 +2795,20 @@ msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
 "dla u�ytkownika: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Powt�rzone wyra�enie przej�ciowe: "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5f83176f9..4c3756ded 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -2724,25 +2724,25 @@ msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2753,35 +2753,35 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linha muito longa\n"
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2791,20 +2791,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f72a41b5e..40e9632d3 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt\n"
@@ -2718,25 +2718,25 @@ msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2747,34 +2747,34 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2784,20 +2784,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
diff --git a/po/ru.po b/po/ru.po
index 9666a0f28..1c7d07a71 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -2835,25 +2835,25 @@ msgstr "���������� ������������� ������ �������� ������: %s\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2864,12 +2864,12 @@ msgstr ""
 "��� ����� �������� �����, ����� ��������� ����\n"
 "������������: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "������� �������� �����: %s\n"
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "��������� �������� �����: %s\n"
@@ -2877,7 +2877,7 @@ msgstr "��������� �������� �����: %s\n"
 # ################################
 # ####### Help msgids ############
 # ################################
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr ""
@@ -2893,20 +2893,20 @@ msgstr ""
 "werden,\n"
 "sind i.d.R. eine gute Wahl"
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2916,22 +2916,22 @@ msgstr ""
 "��� ����� �������� �����, ����� ��������� ����\n"
 "������������: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 #, fuzzy
 msgid "can't query password in batchmode\n"
 msgstr "���������� ������� ��� � �������� ������.\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "������� �������� �����: %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "��������� �������� �����: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 9e1af9240..4e5c4c82f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-11-16 17:59+0100\n"
+"POT-Creation-Date: 2000-11-24 13:52+0100\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -2740,25 +2740,25 @@ msgstr "kan inte hantera algoritm %d f�r publik nyckelhantering\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:221
+#: g10/passphrase.c:223
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:227
+#: g10/passphrase.c:229
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:246
+#: g10/hkp.c:170 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:307 g10/passphrase.c:546
+#: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:323
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -2769,34 +2769,34 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
 "anv�ndaren: \""
 
-#: g10/passphrase.c:338
+#: g10/passphrase.c:344
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Ange l�senordsfras: "
 
-#: g10/passphrase.c:340
+#: g10/passphrase.c:346
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repetera l�senordsfrasen: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:384
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:390
+#: g10/passphrase.c:396
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:399
+#: g10/passphrase.c:405
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:402 g10/passphrase.c:467
+#: g10/passphrase.c:408 g10/passphrase.c:477
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:543
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2806,20 +2806,20 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
 "anv�ndaren: \""
 
-#: g10/passphrase.c:541
+#: g10/passphrase.c:552
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:590
 msgid "can't query password in batchmode\n"
 msgstr "kan inte fr�ga efter l�senord i batch-l�ge\n"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:594
 msgid "Enter passphrase: "
 msgstr "Ange l�senordsfras: "
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:598
 msgid "Repeat passphrase: "
 msgstr "Repetera l�senordsfrasen: "
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index ae43d4519..dc6c227b7 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-24  Werner Koch  <[email protected]>
+
+	* build-w32: New script to build the W32 version.
+	* distfiles: And put it into the distribution
+
 Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <[email protected]>
 
         * gnupg.spec.in: Updated.
diff --git a/scripts/distfiles b/scripts/distfiles
index 13127323a..8a81c9da8 100644
--- a/scripts/distfiles
+++ b/scripts/distfiles
@@ -3,6 +3,7 @@ config.sub
 install-sh
 mkinstalldirs
 mkdiff
+build-w32
 missing
 gnupg.spec.in
 autogen.sh
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 0b407ec39..2bb979096 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -20,10 +20,10 @@ fi
 rm * || true
 ln ../g10/gpg gpg.exe
 i386--mingw32-strip gpg.exe
-if [ -t ../doc/gpg.man ] ; then
+if [ -f ../doc/gpg.man ] ; then
   sed `printf "s/\b.//g"` ../doc/gpg.man >gpg.man
 else
-  man -T latin1 -l ../doc/gpg.1 | sed `printf "s/\b.//g"`  >gpg.man
+  man -Tlatin1 -l ../doc/gpg.1 | sed `printf "s/\b.//g"`  >gpg.man
 fi
 todos gpg.man
 cp ${srcdir}/README .