Changed a lot of __MINGW32__ to _WIN32. This should help a bit in

building with native Windows compilers.  On request by Brian Gladman.

42 files changed, 415 insertions, 393 deletions

diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 493525539..630f3eb13 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-30  Werner Koch  <[email protected]>
+
+	* idea-stub.c, random.c: Replaced some __MINGW32__ by _WIN32 and
+	added some _WIN32.
+
 2003-05-21  David Shaw  <[email protected]>
 
 	* bithelp.h, des.c, random.c, rndlinux.c, sha1.c, blowfish.c,
diff --git a/cipher/idea-stub.c b/cipher/idea-stub.c
index 05581ae90..5731aaa33 100644
--- a/cipher/idea-stub.c
+++ b/cipher/idea-stub.c
@@ -1,5 +1,5 @@
 /* idea-stub.c - Dummy module for the deprecated IDEA cipher.
- *	Copyright (C) 2002 Free Software Foundation, Inc.
+ *	Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -41,7 +41,7 @@
 #ifdef HAVE_DL_DLOPEN
 #include <dlfcn.h>
 #endif
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <windows.h>
 #endif
 #include "util.h"
@@ -52,7 +52,7 @@
 #endif
 
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #define HAVE_DL_DLOPEN
 #define USE_DYNAMIC_LINKING
 
@@ -101,7 +101,7 @@ dlsym ( void *handle, const char *name )
     }
   return h;
 }
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 /* We do only support dlopen and the Windows emulation of it. */
 #ifndef HAVE_DL_DLOPEN
@@ -117,7 +117,7 @@ load_module (const char *name)
   void *handle;
   void *sym;
 
-#ifndef __MINGW32__
+#ifndef _WIN32
   /* Make sure we are not setuid. */
   if (getuid() != geteuid())
     log_bug("trying to load an extension while still setuid\n");
diff --git a/cipher/random.c b/cipher/random.c
index c6f748fbb..635ee2138 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -1,5 +1,6 @@
 /* random.c  -	random number generator
- * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002,
+ *               2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -33,7 +34,9 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#ifndef _WIN32
 #include <sys/time.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -50,7 +53,7 @@
 #ifdef HAVE_GETRUSAGE
 #include <sys/resource.h>
 #endif
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <process.h>
 #endif
 #include "util.h"
diff --git a/g10/ChangeLog b/g10/ChangeLog
index b19b50166..c0d5b0c03 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
 2003-07-30  Werner Koch  <[email protected]>
 
+	* photoid.c, passphrase.c, g10.c, exec.c: Replaced some
+	__MINGW32__ by _WIN32.
+
 	* g10.c (main): Disable use-agent if passphrase-fd is given
 	later. Suggested by Kurt Garloff.
 
diff --git a/g10/exec.c b/g10/exec.c
index 0278438f6..85c3ab494 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -1,5 +1,5 @@
 /* exec.c - generic call-a-program code
- * Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -59,7 +59,7 @@ int set_exec_path(const char *path,int method) { return G10ERR_GENERAL; }
 char *mkdtemp(char *template);
 #endif
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
 /* This is a nicer system() for windows that waits for programs to
    return before returning control to the caller.  I hate helpful
    computers. */
@@ -139,7 +139,7 @@ static int make_tempdir(struct exec_info *info)
 
   if(tmp==NULL)
     {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
       tmp=m_alloc(256);
       if(GetTempPath(256,tmp)==0)
 	strcpy(tmp,"c:\\windows\\temp");
@@ -176,7 +176,7 @@ static int make_tempdir(struct exec_info *info)
 
   sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp);
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
   m_free(tmp);
 #endif
 
@@ -502,7 +502,7 @@ int exec_read(struct exec_info *info)
       if(DBG_EXTPROG)
 	log_debug("system() command is %s\n",info->command);
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
       info->progreturn=win_system(info->command);
 #else
       info->progreturn=system(info->command);
diff --git a/g10/g10.c b/g10/g10.c
index a8d363d9c..0b64f99b7 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1120,7 +1120,7 @@ main( int argc, char **argv )
     opt.keyserver_options.include_subkeys=1;
     opt.keyserver_options.include_revoked=1;
     opt.mangle_dos_filenames = 1;
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     set_homedir ( read_w32_registry_string( NULL,
                                     "Software\\GNU\\GnuPG", "HomeDir" ));
 #else
@@ -1425,7 +1425,7 @@ main( int argc, char **argv )
 	    break;
 	  case oLoadExtension:
 #ifndef __riscos__
-#if defined(USE_DYNAMIC_LINKING) || defined(__MINGW32__)
+#if defined(USE_DYNAMIC_LINKING) || defined(_WIN32)
 	    if(check_permissions(pargs.r.ret_str,2))
 	      log_info(_("cipher extension \"%s\" not loaded due to "
 			 "unsafe permissions\n"),pargs.r.ret_str);
diff --git a/g10/passphrase.c b/g10/passphrase.c
index a736deba8..960069c3e 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #endif
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (_WIN32) || defined (__CYGWIN32__)
 # include <windows.h>
 #endif
 #include <errno.h>
@@ -100,7 +100,7 @@ static char *fd_passwd = NULL;
 static char *next_pw = NULL;
 static char *last_pw = NULL;
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
 static int read_fd = 0;
 static int write_fd = 0;
 #endif
@@ -189,7 +189,7 @@ read_passphrase_from_fd( int fd )
 static int
 writen ( int fd, const void *buf, size_t nbytes )
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     DWORD nwritten, nleft = nbytes;
     
     while (nleft > 0) {
@@ -232,7 +232,7 @@ writen ( int fd, const void *buf, size_t nbytes )
 static int
 readn ( int fd, void *buf, size_t buflen, size_t *ret_nread )
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     DWORD nread, nleft = buflen;
     
     while (nleft > 0) {
@@ -326,7 +326,7 @@ readline (int fd, char *buf, size_t buflen)
 
 #if !defined (__riscos__)
 
-#if !defined (__MINGW32__)
+#if !defined (_WIN32)
 /* For the new Assuan protocol we may have to send options */
 static int
 agent_send_option (int fd, const char *name, const char *value)
@@ -431,7 +431,7 @@ agent_send_all_options (int fd)
 #endif
   return rc;
 }
-#endif /*!__MINGW32__*/
+#endif /*!_WIN32*/
 
 
 /*
@@ -442,7 +442,7 @@ agent_send_all_options (int fd)
 static int
 agent_open (int *ret_prot)
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     int fd;
     char *infostr, *p;
     HANDLE h;
@@ -587,7 +587,7 @@ agent_open (int *ret_prot)
 static void
 agent_close ( int fd )
 {
-#if defined (__MINGW32__)
+#if defined (_WIN32)
     HANDLE h = OpenEvent(EVENT_ALL_ACCESS, FALSE, "gpg_agent");
     ResetEvent(h);
 #else
diff --git a/g10/photoid.c b/g10/photoid.c
index 9a8bdefd7..012107ee4 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef __MINGW32__ 
+#ifdef _WIN32 
 # include <windows.h>
 # ifndef VER_PLATFORM_WIN32_WINDOWS
 #  define VER_PLATFORM_WIN32_WINDOWS 1
@@ -223,7 +223,7 @@ char *image_type_to_string(byte type,int style)
 #if !defined(FIXED_PHOTO_VIEWER) && !defined(DISABLE_PHOTO_VIEWER)
 static const char *get_default_photo_command(void)
 {
-#if defined(__MINGW32__)
+#if defined(_WIN32)
   OSVERSIONINFO osvi;
 
   memset(&osvi,0,sizeof(osvi));
diff --git a/include/ChangeLog b/include/ChangeLog
index 9674662aa..4a8ef7551 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-30  Werner Koch  <[email protected]>
+
+	* util.h: Replaced some __MINGW32__ by _WIN32.
+
 2003-06-26  David Shaw  <[email protected]>
 
 	* types.h: Prefer using uint64_t when creating a 64-bit unsigned
diff --git a/include/util.h b/include/util.h
index fc09ebe3c..736e5f620 100644
--- a/include/util.h
+++ b/include/util.h
@@ -20,7 +20,7 @@
 #ifndef G10_UTIL_H
 #define G10_UTIL_H
 
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (_WIN32) || defined (__CYGWIN32__)
 #include <stdarg.h>
 #endif
 
@@ -229,7 +229,7 @@ int strncasecmp (const char *, const char *b, size_t n);
 #define memmove(d, s, n) bcopy((s), (d), (n))
 #endif
 
-#if defined (__MINGW32__)
+#if defined (_WIN32)
 /*-- w32reg.c --*/
 char *read_w32_registry_string( const char *root,
 				const char *dir, const char *name );
diff --git a/po/ca.po b/po/ca.po
index 5c1d1df42..ac8628006 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -26,7 +26,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-14 18:29+0200\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -305,64 +305,64 @@ msgstr "... a�� �s un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir �%s�: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no es pot fer stat de �%s�: %s\n"
 
 # Descartar, deixar passar...  ignorar �s un anglicisme.  ivb
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "�%s� no �s un fitxer regular: es descarta\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fitxer random_seed �s buit\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AV�S: el tamany del fitxer random_seed no �s v�lid - no s'usar�\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no s'ha pogut llegir �%s�: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear �%s�: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no s'ha pogut escriure �%s�: %s\n"
 
 # No em passe! ;)  ivb
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no s'ha pogut tancar �%s�: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AV�S: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/cs.po b/po/cs.po
index 4cbaba795..3439a00d7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-24 17:50+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -271,62 +271,62 @@ msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu ��st `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zav��t `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/da.po b/po/da.po
index 83c444f53..f781ca400 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: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -278,62 +278,62 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/de.po b/po/de.po
index bb918a730..95fc26364 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-07-30 14:48+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -274,63 +274,63 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/el.po b/po/el.po
index 02b44d55b..5f42dafdb 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-25 18:03+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -272,64 +272,64 @@ msgstr "... ���� ����� bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ��� ����� �������� ������ - ���������\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "��������: �� ������ random_seed ����� �����\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "�������������: �� ������ ������� ������� random_seed - ���\n"
 "��������������\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/eo.po b/po/eo.po
index 166a0b611..14cb4e544 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -273,63 +273,63 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/es.po b/po/es.po
index 6f85413ac..bb5b82165 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-25 19:00+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -302,16 +302,16 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener informaci�n de `%s': %s\n"
@@ -321,49 +321,49 @@ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 # Sugerencia a la sugerencia: �qu� tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. Tambi�n se puede poner "descartado".
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s` no es un fichero regular - omitido\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/et.po b/po/et.po
index ec8394fd6..fe44e35ce 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-18 18:13+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -272,62 +272,62 @@ msgstr "... see on viga (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "m�rkus: random_seed fail on t�hi\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei �nnestu lugeda: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/fi.po b/po/fi.po
index 9499f0497..98ce7bf15 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.1\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-30 18:37+0200\n"
 "Last-Translator: Jouni Hiltunen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -271,64 +271,64 @@ msgstr "...t�m� on virhe (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet l�yt�nyt virheen ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "entropian ker�ysmodulia ei haittavissa\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "\"`%s': %s\" avaaminen ei onnistu\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s': %s ei voida lausua\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole normaali tiedosto - j�tet��n huomiotta\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "huom: random_seed tiedosto on tyhj�\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "VAROITUS: random_seed tiedosto on v��r�n kokoinen\n"
 "- tiedostoa ei k�ytet�\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s': %s ei voida lukea\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "random_seed tiedostoa ei p�ivitetty\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s': %s ei voida luoda\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tiedostoon \"`%s': %s\" ei voida kirjoittaa.\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tiedostoa \"`%s': %s\" ei voida sulkea.\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROITUS: k�ytetty satunnaislukugeneraattori ei ole turvallinen.\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/fr.po b/po/fr.po
index c214e7073..15aaf0d2c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-28 18:48+0300\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -279,65 +279,65 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/gl.po b/po/gl.po
index 3c31bfedc..118e38dae 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-24 15:26+0200\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -272,62 +272,62 @@ msgstr "... isto � un erro (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un ficheiro normal - ign�rase\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed est� baleiro\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/hu.po b/po/hu.po
index d776fdd3b..aab21b370 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-24 23:12+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Nagy Ferenc L�szl� <[email protected]>\n"
@@ -272,63 +272,63 @@ msgstr "Ez egy programhiba... (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 "Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/id.po b/po/id.po
index f92778a84..71377257e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-29 14:48GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -274,62 +274,62 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/it.po b/po/it.po
index a44ab20a2..3bb80e332 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-28 02:34+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -273,64 +273,64 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un file regolare - ignorato\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed � vuoto\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/ja.po b/po/ja.po
index 2c6972188..b92ce6574 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-07 22:57+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -275,62 +275,62 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "��%s�פ˽񤱤ޤ���: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/nl.po b/po/nl.po
index cb6293e5f..59f275352 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -276,63 +276,63 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/pl.po b/po/pl.po
index 81dadf575..256536321 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-01-13 22:15+0100\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -282,65 +282,65 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo�na sprawdzi� %s: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo�na odczyta� %s: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na stworzy� %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo�na zapisa� %s: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� %s: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/pt.po b/po/pt.po
index f5ed78af8..c6a80f541 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -275,63 +275,63 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed est� vazia\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel ler `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel escrever `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ee92d3604..dfd306162 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -285,63 +285,63 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/ro.po b/po/ro.po
index ff51d2795..58b07c0bd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-11 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -277,66 +277,66 @@ msgstr "... acesta este un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "a�i g�sit un bug ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nu pot ob�ine statistici `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nu este un fi�ier normal - ignorat\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "not�: fi�ier random_seed este gol\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
 "folosit�\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nu pot citi `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nu pot scrie `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nu pot �nchide `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "AVERISMENT: este folosit un generator de numere aleatoare nesigur "
 "(insecure)!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/sk.po b/po/sk.po
index 1bdf9ea73..60bec8cf8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-28 00:00+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -271,62 +271,62 @@ msgstr "... toto je chyba v programe (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nem��em ��ta� `%s': %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nem��em zapisova� do `%s': %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/sv.po b/po/sv.po
index b65ef8124..85132cced 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -20,7 +20,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-04-30 18:47+0200\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -288,62 +288,62 @@ msgstr "... detta �r ett fel i programmet (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status p� \"%s\": %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" �r inte �n vanlig fil - ignorerad\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed �r tom\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varning: slumpk�rnan har en felaktig storlek och anv�nds d�rf�r inte\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte l�sa \"%s\": %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte st�nga \"%s\": %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: anv�nder en os�ker slumptalsgenerator!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/tr.po b/po/tr.po
index 5e0ac141f..e34631c32 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-21 11:08+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -275,62 +275,62 @@ msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7734580ba..a45bc7f48 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-07-30 09:55+0200\n"
+"POT-Creation-Date: 2003-07-30 18:02+0200\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -275,62 +275,62 @@ msgstr "... �o�O�ӷ岫 (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�p���@�ӷ岫�F ... (%s:%d)\n"
 
-#: cipher/random.c:160
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "��������üƻ`���Ҳ�\n"
 
-#: cipher/random.c:384 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�L�k�}�� `%s' �G %s\n"
 
-#: cipher/random.c:388
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�L�k���o�ɮ� `%s' ����T�G %s\n"
 
-#: cipher/random.c:393
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ���O�@�ӼзǪ��ɮ� �w �w���L\n"
 
-#: cipher/random.c:398
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "�Ъ`�N�G random_seed �ɮ׬O�Ū�\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "ĵ�i�G random_seed �ɮפj�p�L�� �w �����ĥ�\n"
 
-#: cipher/random.c:412
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�L�kŪ�� `%s' �G %s\n"
 
-#: cipher/random.c:450
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
 
-#: cipher/random.c:470 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�L�k�إ� `%s' �G %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�L�k�g�J `%s' �G %s\n"
 
-#: cipher/random.c:480
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�L�k���� `%s' �G %s\n"
 
-#: cipher/random.c:725
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ĵ�i�G���b�ϥΤ��w�����H���Ʀr���;��I�I\n"
 
-#: cipher/random.c:726
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
diff --git a/util/ChangeLog b/util/ChangeLog
index d676f2f57..0c5cdf9f8 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-30  Werner Koch  <[email protected]>
+
+	* dotlock.c [_WIN32]: Don't include sys/time.h 
+	* http.c, iobuf.c, simple-gettext.c: s/__MINGW32__/_WIN32/.
+	* strgutil.c, ttyio.c, w32reg.c: Ditto.
+	
 2003-06-07  Werner Koch  <[email protected]>
 
 	* iobuf.c (check_special_filename): Replaced is isdigit by digitp
diff --git a/util/dotlock.c b/util/dotlock.c
index 48b53b364..f4ab37327 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -29,7 +29,9 @@
 #include <sys/utsname.h>
 #endif
 #include <sys/types.h>
+#ifndef _WIN32
 #include <sys/time.h>
+#endif
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/util/http.c b/util/http.c
index a272082f1..088c24f59 100644
--- a/util/http.c
+++ b/util/http.c
@@ -1,5 +1,5 @@
 /* http.c  -  HTTP protocol handler
- *	Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <unistd.h>
@@ -53,7 +53,7 @@
 #define HTTP_PROXY_ENV_PRINTABLE "$http_proxy"
 #endif
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #define sock_close(a)  closesocket(a)
 #else
 #define sock_close(a)  close(a)
@@ -83,7 +83,7 @@ static int parse_response( HTTP_HD hd );
 static int connect_server( const char *server, ushort port );
 static int write_server( int sock, const char *data, size_t length );
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 static void
 deinit_sockets (void)
 {
@@ -113,7 +113,7 @@ init_sockets (void)
     atexit ( deinit_sockets );
     initialized = 1;
 }
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 
 int
@@ -712,7 +712,7 @@ static int
 connect_server( const char *server, ushort port )
 {
     int sd;
-#ifdef __MINGW32__
+#ifdef _WIN32
     struct hostent *hp;
     struct sockaddr_in ad;
     unsigned long l;
@@ -785,7 +785,7 @@ write_server( int sock, const char *data, size_t length )
 
     nleft = length;
     while( nleft > 0 ) {
-#ifdef __MINGW32__  
+#ifdef _WIN32  
         int nwritten;
 
         nwritten = send (sock, data, nleft, 0);
diff --git a/util/iobuf.c b/util/iobuf.c
index 723255e62..11a513fb1 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -1,5 +1,5 @@
 /* iobuf.c  -  file handling
- *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -96,7 +96,7 @@ typedef struct {
  static CLOSE_CACHE close_cache;
 #endif
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 typedef struct {
     int sock;
     int keep_open;
@@ -105,7 +105,7 @@ typedef struct {
     int  print_only_name; /* flags indicating that fname is not a real file*/
     char fname[1]; /* name of the file */
 } sock_filter_ctx_t ;
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 /* The first partial length header block must be of size 512
  * to make it easier (and efficienter) we use a min. block size of 512
@@ -515,7 +515,7 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
     return rc;
 }
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 /* Becuase sockets are an special object under Lose32 we have to
  * use a special filter */
 static int
@@ -587,7 +587,7 @@ sock_filter (void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
     }
     return rc;
 }
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 /****************
  * This is used to implement the block write mode.
@@ -1122,7 +1122,7 @@ IOBUF
 iobuf_sockopen ( int fd, const char *mode )
 {
     IOBUF a;
-#ifdef __MINGW32__
+#ifdef _WIN32
     sock_filter_ctx_t *scx;
     size_t len;
 
@@ -1261,7 +1261,7 @@ iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval )
                 b->keep_open = intval;
                 return 0;
             }
-#ifdef __MINGW32__
+#ifdef _WIN32
             else if( !a->chain && a->filter == sock_filter ) {
                 sock_filter_ctx_t *b = a->filter_ov;
                 b->keep_open = intval;
@@ -1290,7 +1290,7 @@ iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval )
                 b->no_cache = intval;
                 return 0;
             }
-#ifdef __MINGW32__
+#ifdef _WIN32
             else if( !a->chain && a->filter == sock_filter ) {
                 sock_filter_ctx_t *b = a->filter_ov;
                 b->no_cache = intval;
@@ -2141,7 +2141,7 @@ iobuf_read_line( IOBUF a, byte **addr_of_buffer,
 int
 iobuf_translate_file_handle ( int fd, int for_write )
 {
-#ifdef __MINGW32__
+#ifdef _WIN32
     {
         int x;
             
@@ -2164,7 +2164,7 @@ iobuf_translate_file_handle ( int fd, int for_write )
 static int
 translate_file_handle ( int fd, int for_write )
 {
-#ifdef __MINGW32__
+#ifdef _WIN32
 #ifdef FILE_FILTER_USES_STDIO  
     fd = iobuf_translate_file_handle (fd, for_write);
 #else
diff --git a/util/simple-gettext.c b/util/simple-gettext.c
index 5d29804f1..151e7b326 100644
--- a/util/simple-gettext.c
+++ b/util/simple-gettext.c
@@ -27,8 +27,8 @@
 
 #include <config.h>
 #ifdef USE_SIMPLE_GETTEXT
-#if !defined (__MINGW32__) && !defined (__CYGWIN32__)
-#error This file can only be used with MingW32 or Cygwin32
+#if !defined (_WIN32) && !defined (__CYGWIN32__)
+#error This file can only be used udner Windows or Cygwin32
 #endif
 
 #include <stdio.h>
diff --git a/util/strgutil.c b/util/strgutil.c
index 05524d84d..2db4182a5 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -860,7 +860,7 @@ strncasecmp( const char *a, const char *b, size_t n )
 #endif
 
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 /* 
  * Like vsprintf but provides a pointer to malloc'd storage, which
  * must be freed by the caller (m_free).  Taken from libiberty as
@@ -954,5 +954,4 @@ vasprintf ( char **result, const char *format, va_list args)
     return 0;
 }
 
-#endif /*__MINGW32__*/
-
+#endif /*_WIN32*/
diff --git a/util/ttyio.c b/util/ttyio.c
index 5fc26b422..1612dc32c 100644
--- a/util/ttyio.c
+++ b/util/ttyio.c
@@ -37,10 +37,10 @@
 #define HAVE_TCGETATTR
 #endif
 #endif
-#ifdef __MINGW32__ /* use the odd Win32 functions */
+#ifdef _WIN32 /* use the odd Win32 functions */
 #include <windows.h>
 #ifdef HAVE_TCGETATTR
-#error mingw32 and termios
+#error windows and termios
 #endif
 #endif
 #include <errno.h>
@@ -51,7 +51,7 @@
 
 #define CONTROL_D ('D' - 'A' + 1)
 
-#ifdef __MINGW32__ /* use the odd Win32 functions */
+#ifdef _WIN32 /* use the odd Win32 functions */
 static struct {
     HANDLE in, out;
 } con;
@@ -124,7 +124,7 @@ init_ttyfp(void)
     if( initialized )
 	return;
 
-#if defined(__MINGW32__)
+#if defined(_WIN32)
     {
 	SECURITY_ATTRIBUTES sa;
 
@@ -194,7 +194,7 @@ tty_printf( const char *fmt, ... )
 	init_ttyfp();
 
     va_start( arg_ptr, fmt ) ;
-#ifdef __MINGW32__
+#ifdef _WIN32
     {   
         char *buf = NULL;
         int n;
@@ -231,7 +231,7 @@ tty_print_string( byte *p, size_t n )
     if( !initialized )
 	init_ttyfp();
 
-#ifdef __MINGW32__
+#ifdef _WIN32
     /* not so effective, change it if you want */
     for( ; n; n--, p++ )
 	if( iscntrl( *p ) ) {
@@ -325,7 +325,7 @@ do_get( const char *prompt, int hidden )
     buf = m_alloc(n=50);
     i = 0;
 
-#ifdef __MINGW32__ /* windoze version */
+#ifdef _WIN32 /* windoze version */
     if( hidden )
 	SetConsoleMode(con.in, HID_INPMODE );
 
@@ -480,7 +480,7 @@ tty_kill_prompt()
 	last_prompt_len = 0;
     if( !last_prompt_len )
 	return;
-#ifdef __MINGW32__
+#ifdef _WIN32
     tty_printf("\r%*s\r", last_prompt_len, "");
 #else
     {
diff --git a/util/w32reg.c b/util/w32reg.c
index aa507b2d7..edc77ced9 100644
--- a/util/w32reg.c
+++ b/util/w32reg.c
@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
+#if defined (_WIN32) || defined (__CYGWIN32__)
  /* This module is only used in this environment */
 
 #include <stdio.h>