Update head to match stable 1.0

1 files changed, 5 insertions, 5 deletions

diff --git a/util/simple-gettext.c b/util/simple-gettext.c
index 80dbbfe0e..db229437d 100644
--- a/util/simple-gettext.c
+++ b/util/simple-gettext.c
@@ -1,5 +1,5 @@
 /* simple-gettext.c  - a simplified version of gettext.
- * Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -19,7 +19,7 @@
  */
 
 /* This is a simplified version of gettext written by Ulrich Drepper.
- * It is used for the Win32 version of GnuPG becuase all the overhead
+ * It is used for the Win32 version of GnuPG beucase all the overhead
  * of gettext is not needed and we have to do some special Win32 stuff.
  * I decided that this is far easier than to tweak gettext for the special
  * cases (I tried it but it is a lot of code).	wk 15.09.99
@@ -27,8 +27,8 @@
 
 #include <config.h>
 #ifdef USE_SIMPLE_GETTEXT
-#ifndef __MINGW32__
-  #error This file can only be used with MinGW32
+#if !defined (__MINGW32__) && !defined (__CYGWIN32__)
+  #error This file can only be used with MingW32 or Cygwin32
 #endif
 
 #include <stdio.h>
@@ -244,7 +244,7 @@ set_gettext_file( const char *filename )
 	    /* absolute path - use it as is */
 	    domain = load_domain( filename );
 	}
-	else { /* relative path - append ".mo" and get DIR from the Registry */
+	else { /* relative path - append ".mo" and get dir from the environment */
 	    char *buf = NULL;
 	    char *dir;