[git] GpgEX - branch, master, updated. gpgex-0.9.7-23-g2ff96b6

by Werner Koch cvs at cvs.gnupg.org
Wed Jun 26 16:42:49 CEST 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnupG extension for the Windows Explorer".

The branch, master has been updated
       via  2ff96b6ed1742d86a5be7972d241e2cb9a18886b (commit)
       via  296829d61514a25452cc113c41cdf7153ec4d90c (commit)
       via  29e493fc945d240f8a0cfe28ff7f80e57cf8e5ee (commit)
      from  c2448a310fc9ce88b15602f6948b260d8271e529 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2ff96b6ed1742d86a5be7972d241e2cb9a18886b
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 26 15:59:55 2013 +0200

    Improve starting of the UI-server.
    
    * client.cc (default_uiserver_cmdline): Replace code with code
    from gpgol so that gpgol will also be tried.   Use the
    installation root to find the default UI server.
    (call_assuan): Print the name of teh UI-server if it has been
    launched by this instance.
    * main.h (gpgex_server): New.

diff --git a/src/ChangeLog b/src/ChangeLog
index 86bc3ad..a6f7a7c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,18 @@
 2013-06-26  Werner Koch  <wk at gnupg.org>
 
+	* client.cc (default_uiserver_cmdline): Replace code with code
+	from gpgol so that gpgol will also be tried.   Use the
+	installation root to find the default UI server.
+	(call_assuan): Print the name of teh UI-server if it has been
+	launched by this instance.
+	* main.h (gpgex_server): New.
+
 	* gpgex.cc (get_lang_name): Rewrite using gettext.
 	(start_help): Improve language detection.  Remove fallback to an
 	external URL.
 	* main.h (gpgex_server): Add root_dir.
 	(utf8_to_wchar): Add prototype.
+
 	* main.cc (gpgex_server::root_dir): New.
 	(get_locale_dir): Pass then instance to GetModuleFileNameW.  Store
 	the root dir.
diff --git a/src/client.cc b/src/client.cc
index 3f17de3..6fc9162 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,5 +1,5 @@
 /* client.cc - gpgex assuan client implementation
-   Copyright (C) 2007, 2008 g10 Code GmbH
+   Copyright (C) 2007, 2008, 2013 g10 Code GmbH
 
    This file is part of GpgEX.
 
@@ -40,6 +40,17 @@ using std::string;
 
 #include "client.h"
 
+static inline char *
+_gpgex_stpcpy (char *a, const char *b)
+{
+  while (*b)
+    *a++ = *b++;
+  *a = 0;
+  return a;
+}
+#define stpcpy(a,b) _gpgex_stpcpy ((a), (b))
+
+
 

 static const char *
 default_socket_name (void)
@@ -62,49 +73,79 @@ default_socket_name (void)
 }
 
 
+/* Return the name of the default UI server.  This name is used to
+   auto start an UI server if an initial connect failed.  */
 static const char *
 default_uiserver_cmdline (void)
 {
-  static string name;
+  static char *name;
 
-  if (name.size () == 0)
+  if (!name)
     {
-      char *dir = NULL;
+      const char *dir;
+      char *uiserver, *p;
+      int extra_arglen = 0;
 
-      dir = read_w32_registry_string ("HKEY_LOCAL_MACHINE", REGKEY,
-				      "Install Directory");
-      if (dir)
-	{
-	  char *uiserver_buffer = NULL;
-          const char *uiserver;
-
-	  uiserver_buffer = read_w32_registry_string (NULL,
-                                                      REGKEY, "UI Server");
-	  if (uiserver_buffer)
-            uiserver = uiserver_buffer;
-          else
-	    {
-	      string fname;
-
-	      try { fname = ((string) dir) + "\\"
-		  + "kleopatra.exe"; } catch (...) {}
-
-	      /* The option --use-standard-socket is the default on
-		 windows, so we can omit it here.  */
-	      if (! access (fname.c_str (), F_OK))
-		uiserver = "kleopatra.exe --daemon";
-	      else
-		uiserver = "gpa.exe --daemon";
-	    }
-
-	  try { name = ((string) dir) + "\\" + uiserver; } catch (...) {}
-
-          free (uiserver_buffer);
-	  free ((void *) dir);
-	}
+      dir = gpgex_server::root_dir;
+      if (!dir)
+        return NULL;
+
+      uiserver = read_w32_registry_string (NULL, REGKEY, "UI Server");
+      if (!uiserver)
+        {
+          uiserver = strdup ("kleopatra.exe");
+          if (!uiserver)
+            return NULL;
+          extra_arglen = 9; /* Space required for " --daemon".  */
+        }
+
+      name = (char*)malloc (strlen (dir) + strlen (uiserver) + extra_arglen +2);
+      if (!name)
+        {
+          free (uiserver);
+          return NULL;
+        }
+      strcpy (stpcpy (stpcpy (name, dir), "\\"), uiserver);
+      for (p = name; *p; p++)
+        if (*p == '/')
+          *p = '\\';
+      free (uiserver);
+      gpgex_server::ui_server = "Kleopatra";
+      if (extra_arglen && access (name, F_OK))
+        {
+          /* Kleopatra is not installed: Try GPA instead but if it is
+             also not available return the Kleopatra filename.  */
+          const char gpaserver[] = "gpa.exe";
+          char *name2;
+
+          name2 = (char*)malloc (strlen (dir) + strlen (gpaserver)
+                                 + extra_arglen+2);
+          if (name2)
+            {
+              strcpy (stpcpy (stpcpy (name2, dir), "\\"), gpaserver);
+              for (p = name2; *p; p++)
+                if (*p == '/')
+                  *p = '\\';
+              if (access (name2, F_OK ))
+                free (name2);
+              else
+                {
+                  free (name);
+                  name = name2;
+                  gpgex_server::ui_server = "GPA";
+                }
+            }
+        }
+
+      /* Append the --daemon arg unless the server name has been taken
+         from the Registry.  */
+      if (name && extra_arglen)
+        strcat (name, " --daemon");
+      else
+        gpgex_server::ui_server = NULL;
     }
 
-  return name.c_str ();
+  return name;
 }
 
 

@@ -364,7 +405,11 @@ client_t::call_assuan (const char *cmd, vector<string> &filenames)
   if (rc)
     {
       char buf[256];
-      snprintf (buf, sizeof (buf), _("Can not access Kleopatra:\r\n%s"),
+      snprintf (buf, sizeof (buf),
+                _("Can not access the UI-server%s%s%s:\r\n%s"),
+                gpgex_server::ui_server? " (":"",
+                gpgex_server::ui_server? gpgex_server::ui_server:"",
+                gpgex_server::ui_server? ")":"",
 		gpg_strerror (rc));
       MessageBox (this->window, buf, "GpgEX", MB_ICONINFORMATION);
     }
diff --git a/src/gpgex.cc b/src/gpgex.cc
index 2b8a160..8c973d8 100644
--- a/src/gpgex.cc
+++ b/src/gpgex.cc
@@ -515,8 +515,9 @@ get_lang_name (void)
 }
 
 
-/* FIXME: Might be exported in a helper utility.  Also, it might be
-   that we use KDE's help browser?  */
+/* According to MSDN using ShellExecute may be problematic when using
+   within the Shell.  Thus we call Internet explorer directly.  It is
+   anyway only used for local files.  */
 static void
 start_help (HWND hwnd)
 {
@@ -581,7 +582,6 @@ start_help (HWND hwnd)
       }
   }
 
-
   if (wurl)
     {
       BSTR burl = SysAllocString ((const OLECHAR *)wurl);
diff --git a/src/main.cc b/src/main.cc
index 0b354e1..dcade3b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -48,6 +48,10 @@ LONG gpgex_server::refcount;
 /* The root of our installation.  */
 const char *gpgex_server::root_dir;
 
+/* The name of the UI-server or NULL if not known.  */
+const char *gpgex_server::ui_server;
+
+
 

 static char *
 get_locale_dir (void)
diff --git a/src/main.h b/src/main.h
index a66aadd..641799e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -59,6 +59,8 @@ class gpgex_server
   /* The root of our installation.  */
   static const char *root_dir;
 
+  static const char *ui_server;
+
   /* Acquire a reference to the server component.  */
   static inline ULONG
     add_ref (void)

commit 296829d61514a25452cc113c41cdf7153ec4d90c
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 26 15:19:28 2013 +0200

    Improve help file loading.
    
    * gpgex.cc (get_lang_name): Rewrite using gettext.
    (start_help): Improve language detection.  Remove fallback to an
    external URL.
    * main.h (gpgex_server): Add root_dir.
    (utf8_to_wchar): Add prototype.
    * main.cc (gpgex_server::root_dir): New.
    (get_locale_dir): Pass then instance to GetModuleFileNameW.  Store
    the root dir.
    (utf8_to_wchar): New.
    (DllMain): Run i18n_init after debug_init.
    --
    
    The help file is now only loaded for on-disk files and never anymore
    from a web site.  The location of the help file is determined using
    the installation directory of gpgex.dll.  When looking for the help
    file, the language with variant (e.g. "de_DE") is tried first, if that
    does not exist a file with just the language tag (e.g. "de") is tried;
    if that also also fails "en" is used as language tag.

diff --git a/NEWS b/NEWS
index 4c198c1..36eae32 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Noteworthy changes for version 1.0.0 (unreleased)
 
 * Support 64 bit Windows.
 
+* Improved help file detection.
+
 
 Noteworthy changes for version 0.9.7 (2010-07-21)
 -------------------------------------------------
diff --git a/src/ChangeLog b/src/ChangeLog
index cded8db..86bc3ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2013-06-26  Werner Koch  <wk at gnupg.org>
+
+	* gpgex.cc (get_lang_name): Rewrite using gettext.
+	(start_help): Improve language detection.  Remove fallback to an
+	external URL.
+	* main.h (gpgex_server): Add root_dir.
+	(utf8_to_wchar): Add prototype.
+	* main.cc (gpgex_server::root_dir): New.
+	(get_locale_dir): Pass then instance to GetModuleFileNameW.  Store
+	the root dir.
+	(utf8_to_wchar): New.
+	(DllMain): Run i18n_init after debug_init.
+
 2010-07-21  Werner Koch  <wk at g10code.com>
 
 	* main.cc (DllMain): Add explicit init and deinit of libgpg-error.
@@ -207,7 +220,7 @@
 	(gpgex_SOURCES): Add $(ICONS).
 
 	* Makefile.am (gpgex_LDADD): More -lws2_32 after ./libassuan.a.
-	
+
 
 2007-09-04  Marcus Brinkmann  <marcus at g10code.de>
 
@@ -280,7 +293,7 @@
 	New macros.
 	(_gpgex_debug): New prototype.
 	* main.cc: Include <stdarg.h>, <stdio.h> and <shlobj.h>.  Add
-	debugging traces.	
+	debugging traces.
 	(debug_lock, debug_flags, debug_file): New statics.
 	(get_debug_file, debug_init, debug_deinit): New static functions.
 	(_gpgex_debug): New function.
diff --git a/src/gpgex.cc b/src/gpgex.cc
index 45f63bc..2b8a160 100644
--- a/src/gpgex.cc
+++ b/src/gpgex.cc
@@ -1,5 +1,5 @@
 /* gpgex.cc - gpgex implementation
-   Copyright (C) 2007 g10 Code GmbH
+   Copyright (C) 2007, 2013 g10 Code GmbH
 
    This file is part of GpgEX.
 
@@ -476,23 +476,45 @@ gpgex_t::GetCommandString (UINT_PTR idCommand, UINT uFlags, LPUINT lpReserved,
 }
 
 
+/* Return the lang name.  This is either "xx" or "xx_YY".  On error
+   "en" is returned.  */
 static const char *
 get_lang_name (void)
 {
-  LANGID lang;
+  static char *name;
+  const char *s;
+  char *p;
+  int count = 0;
 
-  lang = GetUserDefaultUILanguage ();
-  switch (PRIMARYLANGID (lang))
+  if (!name)
     {
-    case LANG_GERMAN:
-      return "de";
-
-    case LANG_ENGLISH:
-    default:
-      return "en";
+      s = gettext_localename ();
+      if (!s)
+        s = "en";
+      else if (!strcmp (s, "C") || !strcmp (s, "POSIX"))
+        s = "en";
+
+      name = strdup (s);
+      if (!name)
+        return "en";
+
+      for (p = name; *p; p++)
+        {
+
+          if (*p == '.' || *p == '@' || *p == '/' /*(safeguard)*/)
+            *p = 0;
+          else if (*p == '_')
+            {
+              if (count++)
+                *p = 0;  /* Also cut at a underscore in the territory.  */
+            }
+        }
     }
+
+  return name;
 }
 
+
 /* FIXME: Might be exported in a helper utility.  Also, it might be
    that we use KDE's help browser?  */
 static void
@@ -524,37 +546,55 @@ start_help (HWND hwnd)
   // width, height
   web->put_Visible (VARIANT_TRUE);
 
-#define URLSIZE 512
-  wchar_t url[URLSIZE];
+  wchar_t *wurl;
   {
-    char *dir = NULL;
+#define URLSIZE 512
+    char url[URLSIZE];
+    const char *lang = get_lang_name ();
+
+    snprintf (url, URLSIZE, "file:///%s\\share\\doc\\gpgex\\gpgex-%s.html",
+              gpgex_server::root_dir, lang);
+    url[URLSIZE - 1] = '\0';
+    wurl = utf8_to_wchar (url);
 
-    dir = read_w32_registry_string ("HKEY_LOCAL_MACHINE", REGKEY,
-				    "Install Directory");
-    if (!dir)
-      _snwprintf (url, URLSIZE, L"%S", "http://www.gpg4win.org/");
-    else
+    /* We need to test whether we need to fall back to the generic
+       lang id.  */
+    if (wurl && strchr (lang, '_') && _waccess (wurl+8, 0))
       {
-	int sep = 0;
-	int len = strlen (dir) - 1;
-	if (len >= 0 && (dir[len] == '\\' || dir[len] == '/'))
-	  sep = 1;
-	_snwprintf (url,
-		    URLSIZE, L"file:///%S%Sshare\\doc\\gpgex\\gpgex-%S.html",
-		    dir, sep ? "" : "\\", get_lang_name ());
+        snprintf (url, URLSIZE,
+                  "file:///%s\\share\\doc\\gpgex\\gpgex-%.2s.html",
+                  gpgex_server::root_dir, lang);
+        url[URLSIZE - 1] = '\0';
+        free (wurl);
+        wurl = utf8_to_wchar (url);
+      }
+
+    /* If the help file does not exists fall back to the english version.  */
+    if (wurl && _waccess (wurl+8, 0))
+      {
+        snprintf (url, URLSIZE,
+                  "file:///%s\\share\\doc\\gpgex\\gpgex-en.html",
+                  gpgex_server::root_dir);
+        url[URLSIZE - 1] = '\0';
+        free (wurl);
+        wurl = utf8_to_wchar (url);
       }
-    url[URLSIZE - 1] = '\0';
   }
 
-  BSTR burl = SysAllocString ((const OLECHAR *) url);
-  VARIANT vars[4];
-  memset (vars, 0, sizeof (vars));
-  res = web->Navigate (burl, vars, vars + 1, vars + 2, vars + 3);
-  SysFreeString (burl);
-  if (!SUCCEEDED (res))
+
+  if (wurl)
     {
-      web->Release ();
-      return;
+      BSTR burl = SysAllocString ((const OLECHAR *)wurl);
+      VARIANT vars[4];
+      memset (vars, 0, sizeof (vars));
+      res = web->Navigate (burl, vars, vars + 1, vars + 2, vars + 3);
+      SysFreeString (burl);
+      free (wurl);
+      if (!SUCCEEDED (res))
+        {
+          web->Release ();
+          return;
+        }
     }
 
   /* Do more stuff.  */
diff --git a/src/main.cc b/src/main.cc
index 01ef6b7..0b354e1 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -45,6 +45,9 @@ HINSTANCE gpgex_server::instance;
 /* The number of references to this component.  */
 LONG gpgex_server::refcount;
 
+/* The root of our installation.  */
+const char *gpgex_server::root_dir;
+
 

 static char *
 get_locale_dir (void)
@@ -53,7 +56,7 @@ get_locale_dir (void)
   char *result, *p;
   int nbytes;
 
-  if (!GetModuleFileNameW (NULL, moddir, MAX_PATH))
+  if (!GetModuleFileNameW (gpgex_server::instance, moddir, MAX_PATH))
     *moddir = 0;
 
 #define SLDIR "\\share\\locale"
@@ -98,6 +101,9 @@ get_locale_dir (void)
               p = strrchr (result, '\\');
               if (p && !strcmp (p+1, "bin"))
                 *p = 0;
+
+              gpgex_server::root_dir = strdup (result);
+
               /* Append the static part.  */
               strcat (result, SLDIR);
             }
@@ -112,6 +118,11 @@ get_locale_dir (void)
           strcat (result, SLDIR);
         }
     }
+
+  if (!gpgex_server::root_dir)
+    gpgex_server::root_dir = "c:";
+
+  _gpgex_debug (1, "root dir is '%s'", gpgex_server::root_dir);
 #undef SLDIR
   return result;
 }
@@ -193,6 +204,10 @@ debug_deinit (void)
 }
 
 
+
+
+
+
 #ifdef __cplusplus
 extern "C" {
 #if 0
@@ -225,6 +240,36 @@ _gpgex_debug (unsigned int flags, const char *format, ...)
   errno = saved_errno;
 }
 
+
+/* Return a malloced wide char string from an UTF-8 encoded input
+   string STRING.  Caller must free this value. On failure returns
+   NULL; caller may use GetLastError to get the actual error number.
+   The result of calling this function with STRING set to NULL is not
+   defined. */
+wchar_t *
+utf8_to_wchar (const char *string)
+{
+  int n;
+  wchar_t *result;
+
+  n = MultiByteToWideChar (CP_UTF8, 0, string, -1, NULL, 0);
+  if (n < 0)
+    return NULL;
+
+  result = (wchar_t*)malloc ((n+1) * sizeof *result);
+  if (!result)
+    return NULL;
+
+  n = MultiByteToWideChar (CP_UTF8, 0, string, -1, result, n);
+  if (n < 0)
+    {
+      free (result);
+      return NULL;
+    }
+  return result;
+}
+
+
 #ifdef __cplusplus
 #if 0
 {
@@ -244,10 +289,10 @@ DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved)
       /* Early initializations of our subsystems. */
       gpg_err_init ();
 
-      i18n_init ();
-
       debug_init ();
 
+      i18n_init ();
+
       if (debug_flags & DEBUG_ASSUAN)
 	{
 	  assuan_set_assuan_log_stream (debug_file);
diff --git a/src/main.h b/src/main.h
index 622eb59..a66aadd 100644
--- a/src/main.h
+++ b/src/main.h
@@ -56,6 +56,9 @@ class gpgex_server
   /* The number of references to this component.  */
   static LONG refcount;
 
+  /* The root of our installation.  */
+  static const char *root_dir;
+
   /* Acquire a reference to the server component.  */
   static inline ULONG
     add_ref (void)
@@ -64,12 +67,14 @@ class gpgex_server
   }
 
 
-/* Release a reference to the server component.  */
+  /* Release a reference to the server component.  */
   static inline ULONG
     release (void)
   {
     return InterlockedDecrement (&refcount);
   }
+
+
 };
 
 

@@ -79,3 +84,6 @@ class gpgex_server
     (x).Data4[5], (x).Data4[6], (x).Data4[7]
 
 #endif
+
+
+extern "C" wchar_t *utf8_to_wchar (const char *string);

commit 29e493fc945d240f8a0cfe28ff7f80e57cf8e5ee
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 24 19:16:36 2013 +0200

    Use modern gettext implementation from libgpg-error.
    
    * src/w32-gettext.c, src/w32-gettext.h: Remove
    * src/Makefile.am (gpgex_SOURCES): Remove above files.
    * configure.ac (AH_BOTTOM): Define GPG_ERR_ENABLE_GETTEXT_MACROS.
    * src/main.h: Include gpg-error.h.
    (gettext_noop): Move from w32-gettext.h.
    * src/main.cc (get_locale_dir): Replace by code taken from
      libgpg-error.
    (i18n_init): Remove setlocale calls.

diff --git a/configure.ac b/configure.ac
index c2f37a3..bf727aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,9 @@ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
 AH_BOTTOM([
 /* We don't want the old assuan codes anymore. */
 #define _ASSUAN_ONLY_GPG_ERRORS 1
+/* We use the gettext code from libgpg-error.  */
+#define GPG_ERR_ENABLE_GETTEXT_MACROS
+
 ])
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f02d084..d7dfe7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,6 @@ gpgex_SOURCES = 				\
 	gpgex.def				\
 	registry.h registry.c			\
 	exechelp.h exechelp.c			\
-	w32-gettext.c w32-gettext.h		\
 	gpgex-class.h gpgex-class.cc		\
 	gpgex-factory.h gpgex-factory.cc	\
 	bitmaps.h bitmaps.cc			\
diff --git a/src/main.cc b/src/main.cc
index d4fa460..01ef6b7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 /* main.cc - DLL entry point
-   Copyright (C) 2007 g10 Code GmbH
+   Copyright (C) 2007, 2010, 2013 g10 Code GmbH
 
    This file is part of GpgEX.
 
@@ -13,9 +13,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with GpgEX; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -49,31 +49,71 @@ LONG gpgex_server::refcount;
 static char *
 get_locale_dir (void)
 {
-  char *instdir;
-  char *p;
-  char *dname;
+  static wchar_t moddir[MAX_PATH+5];
+  char *result, *p;
+  int nbytes;
 
-  instdir = read_w32_registry_string ("HKEY_LOCAL_MACHINE", REGKEY,
-				      "Install Directory");
-  if (!instdir)
-    return NULL;
+  if (!GetModuleFileNameW (NULL, moddir, MAX_PATH))
+    *moddir = 0;
 
-  /* Build the key: "<instdir>/share/locale".  */
 #define SLDIR "\\share\\locale"
-  dname = static_cast<char *> (malloc (strlen (instdir) + strlen (SLDIR) + 1));
-  if (!dname)
+  if (*moddir)
     {
-      free (instdir);
-      return NULL;
+      nbytes = WideCharToMultiByte (CP_UTF8, 0, moddir, -1, NULL, 0, NULL, NULL);
+      if (nbytes < 0)
+        return NULL;
+
+      result = (char*)malloc (nbytes + strlen (SLDIR) + 1);
+      if (result)
+        {
+          nbytes = WideCharToMultiByte (CP_UTF8, 0, moddir, -1,
+                                        result, nbytes, NULL, NULL);
+          if (nbytes < 0)
+            {
+              free (result);
+              result = NULL;
+            }
+          else
+            {
+              p = strrchr (result, '\\');
+              if (p)
+                *p = 0;
+              /* If we are installed below "bin" strip that part and
+                 use the top directory instead.
+
+                 Background: Under Windows we don't install GnuPG
+                 below bin/ but in the top directory with only share/,
+                 lib/, and etc/ below it.  One of the reasons is to
+                 keep the the length of the filenames at bay so not to
+                 increase the limited length of the PATH envvar.
+                 Another and more important reason, however, is that
+                 the very first GPG versions on W32 were installed
+                 into a flat directory structure and for best
+                 compatibility with these versions we didn't changed
+                 that later.  For WindowsCE we can right away install
+                 it under bin, though.  The hack with detection of the
+                 bin directory part allows us to eventually migrate to
+                 such a directory layout under plain Windows without
+                 the need to change libgpg-error.  */
+              p = strrchr (result, '\\');
+              if (p && !strcmp (p+1, "bin"))
+                *p = 0;
+              /* Append the static part.  */
+              strcat (result, SLDIR);
+            }
+        }
     }
-  p = dname;
-  strcpy (p, instdir);
-  p += strlen (instdir);
-  strcpy (p, SLDIR);
-
-  free (instdir);
-
-  return dname;
+  else /* Use the old default value.  */
+    {
+      result = (char*)malloc (10 + strlen (SLDIR) + 1);
+      if (result)
+        {
+          strcpy (result, "c:\\gnupg");
+          strcat (result, SLDIR);
+        }
+    }
+#undef SLDIR
+  return result;
 }
 
 
@@ -89,15 +129,6 @@ i18n_init (void)
 {
   char *locale_dir;
 
-#ifdef ENABLE_NLS
-# ifdef HAVE_LC_MESSAGES
-  setlocale (LC_TIME, "");
-  setlocale (LC_MESSAGES, "");
-# else
-  setlocale (LC_ALL, "" );
-# endif
-#endif
-
   locale_dir = get_locale_dir ();
   if (locale_dir)
     {
diff --git a/src/main.h b/src/main.h
index fe1b03b..622eb59 100644
--- a/src/main.h
+++ b/src/main.h
@@ -22,15 +22,24 @@
 #define MAIN_H	1
 
 #include <windows.h>
-
 #include "debug.h"
 
 

-#include "w32-gettext.h"
+#include <gpg-error.h>  /* For gettext */
 
 #define _(a) gettext (a)
 #define N_(a) gettext_noop (a)
 
+/* A pseudo function call that serves as a marker for the automated
+   extraction of messages, but does not call gettext().  The run-time
+   translation is done at a different place in the code.
+   The argument, String, should be a literal string.  Concatenated strings
+   and other string expressions won't work.
+   The macro's expansion is not parenthesized, so that it is suitable as
+   initializer for static 'char[]' or 'const char[]' variables.  */
+#define gettext_noop(String) String
+
+
 

 /* We use a class just for namespace cleanliness.  */
 class gpgex_server
diff --git a/src/w32-gettext.c b/src/w32-gettext.c
deleted file mode 100644
index 952d2df..0000000
--- a/src/w32-gettext.c
+++ /dev/null
@@ -1,1796 +0,0 @@
-/* w32-gettext.c - A simple gettext implementation for Windows targets.
-   Copyright (C) 1995,1996,1997,1999,2005 Free Software Foundation, Inc.
-   Copyright (C) 2005 g10 Code GmbH
-
-   This file is part of libgpg-error.
-
-   libgpg-error is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-
-   libgpg-error is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with libgpg-error; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdint.h>
-
-#include "w32-gettext.h"
-
-

-/* localname.c from gettext.  */
-
-/* Edit: Added a "static" to _nl_locale_name.  Note that the category
-   argument is ignored on w32.  */
-
-/* Determine the current selected locale.
-   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Written by Ulrich Drepper <drepper at gnu.org>, 1995.  */
-/* Win32 code written by Tor Lillqvist <tml at iki.fi>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <locale.h>
-
-#ifdef HAVE_W32_SYSTEM
-# include <windows.h>
-/* List of language codes, sorted by value:
-   0x01 LANG_ARABIC
-   0x02 LANG_BULGARIAN
-   0x03 LANG_CATALAN
-   0x04 LANG_CHINESE
-   0x05 LANG_CZECH
-   0x06 LANG_DANISH
-   0x07 LANG_GERMAN
-   0x08 LANG_GREEK
-   0x09 LANG_ENGLISH
-   0x0a LANG_SPANISH
-   0x0b LANG_FINNISH
-   0x0c LANG_FRENCH
-   0x0d LANG_HEBREW
-   0x0e LANG_HUNGARIAN
-   0x0f LANG_ICELANDIC
-   0x10 LANG_ITALIAN
-   0x11 LANG_JAPANESE
-   0x12 LANG_KOREAN
-   0x13 LANG_DUTCH
-   0x14 LANG_NORWEGIAN
-   0x15 LANG_POLISH
-   0x16 LANG_PORTUGUESE
-   0x17 LANG_RHAETO_ROMANCE
-   0x18 LANG_ROMANIAN
-   0x19 LANG_RUSSIAN
-   0x1a LANG_CROATIAN == LANG_SERBIAN
-   0x1b LANG_SLOVAK
-   0x1c LANG_ALBANIAN
-   0x1d LANG_SWEDISH
-   0x1e LANG_THAI
-   0x1f LANG_TURKISH
-   0x20 LANG_URDU
-   0x21 LANG_INDONESIAN
-   0x22 LANG_UKRAINIAN
-   0x23 LANG_BELARUSIAN
-   0x24 LANG_SLOVENIAN
-   0x25 LANG_ESTONIAN
-   0x26 LANG_LATVIAN
-   0x27 LANG_LITHUANIAN
-   0x28 LANG_TAJIK
-   0x29 LANG_FARSI
-   0x2a LANG_VIETNAMESE
-   0x2b LANG_ARMENIAN
-   0x2c LANG_AZERI
-   0x2d LANG_BASQUE
-   0x2e LANG_SORBIAN
-   0x2f LANG_MACEDONIAN
-   0x30 LANG_SUTU
-   0x31 LANG_TSONGA
-   0x32 LANG_TSWANA
-   0x33 LANG_VENDA
-   0x34 LANG_XHOSA
-   0x35 LANG_ZULU
-   0x36 LANG_AFRIKAANS
-   0x37 LANG_GEORGIAN
-   0x38 LANG_FAEROESE
-   0x39 LANG_HINDI
-   0x3a LANG_MALTESE
-   0x3b LANG_SAAMI
-   0x3c LANG_GAELIC
-   0x3d LANG_YIDDISH
-   0x3e LANG_MALAY
-   0x3f LANG_KAZAK
-   0x40 LANG_KYRGYZ
-   0x41 LANG_SWAHILI
-   0x42 LANG_TURKMEN
-   0x43 LANG_UZBEK
-   0x44 LANG_TATAR
-   0x45 LANG_BENGALI
-   0x46 LANG_PUNJABI
-   0x47 LANG_GUJARATI
-   0x48 LANG_ORIYA
-   0x49 LANG_TAMIL
-   0x4a LANG_TELUGU
-   0x4b LANG_KANNADA
-   0x4c LANG_MALAYALAM
-   0x4d LANG_ASSAMESE
-   0x4e LANG_MARATHI
-   0x4f LANG_SANSKRIT
-   0x50 LANG_MONGOLIAN
-   0x51 LANG_TIBETAN
-   0x52 LANG_WELSH
-   0x53 LANG_CAMBODIAN
-   0x54 LANG_LAO
-   0x55 LANG_BURMESE
-   0x56 LANG_GALICIAN
-   0x57 LANG_KONKANI
-   0x58 LANG_MANIPURI
-   0x59 LANG_SINDHI
-   0x5a LANG_SYRIAC
-   0x5b LANG_SINHALESE
-   0x5c LANG_CHEROKEE
-   0x5d LANG_INUKTITUT
-   0x5e LANG_AMHARIC
-   0x5f LANG_TAMAZIGHT
-   0x60 LANG_KASHMIRI
-   0x61 LANG_NEPALI
-   0x62 LANG_FRISIAN
-   0x63 LANG_PASHTO
-   0x64 LANG_TAGALOG
-   0x65 LANG_DIVEHI
-   0x66 LANG_EDO
-   0x67 LANG_FULFULDE
-   0x68 LANG_HAUSA
-   0x69 LANG_IBIBIO
-   0x6a LANG_YORUBA
-   0x70 LANG_IGBO
-   0x71 LANG_KANURI
-   0x72 LANG_OROMO
-   0x73 LANG_TIGRINYA
-   0x74 LANG_GUARANI
-   0x75 LANG_HAWAIIAN
-   0x76 LANG_LATIN
-   0x77 LANG_SOMALI
-   0x78 LANG_YI
-   0x79 LANG_PAPIAMENTU
-*/
-/* Mingw headers don't have latest language and sublanguage codes.  */
-# ifndef LANG_AFRIKAANS
-# define LANG_AFRIKAANS 0x36
-# endif
-# ifndef LANG_ALBANIAN
-# define LANG_ALBANIAN 0x1c
-# endif
-# ifndef LANG_AMHARIC
-# define LANG_AMHARIC 0x5e
-# endif
-# ifndef LANG_ARABIC
-# define LANG_ARABIC 0x01
-# endif
-# ifndef LANG_ARMENIAN
-# define LANG_ARMENIAN 0x2b
-# endif
-# ifndef LANG_ASSAMESE
-# define LANG_ASSAMESE 0x4d
-# endif
-# ifndef LANG_AZERI
-# define LANG_AZERI 0x2c
-# endif
-# ifndef LANG_BASQUE
-# define LANG_BASQUE 0x2d
-# endif
-# ifndef LANG_BELARUSIAN
-# define LANG_BELARUSIAN 0x23
-# endif
-# ifndef LANG_BENGALI
-# define LANG_BENGALI 0x45
-# endif
-# ifndef LANG_BURMESE
-# define LANG_BURMESE 0x55
-# endif
-# ifndef LANG_CAMBODIAN
-# define LANG_CAMBODIAN 0x53
-# endif
-# ifndef LANG_CATALAN
-# define LANG_CATALAN 0x03
-# endif
-# ifndef LANG_CHEROKEE
-# define LANG_CHEROKEE 0x5c
-# endif
-# ifndef LANG_DIVEHI
-# define LANG_DIVEHI 0x65
-# endif
-# ifndef LANG_EDO
-# define LANG_EDO 0x66
-# endif
-# ifndef LANG_ESTONIAN
-# define LANG_ESTONIAN 0x25
-# endif
-# ifndef LANG_FAEROESE
-# define LANG_FAEROESE 0x38
-# endif
-# ifndef LANG_FARSI
-# define LANG_FARSI 0x29
-# endif
-# ifndef LANG_FRISIAN
-# define LANG_FRISIAN 0x62
-# endif
-# ifndef LANG_FULFULDE
-# define LANG_FULFULDE 0x67
-# endif
-# ifndef LANG_GAELIC
-# define LANG_GAELIC 0x3c
-# endif
-# ifndef LANG_GALICIAN
-# define LANG_GALICIAN 0x56
-# endif
-# ifndef LANG_GEORGIAN
-# define LANG_GEORGIAN 0x37
-# endif
-# ifndef LANG_GUARANI
-# define LANG_GUARANI 0x74
-# endif
-# ifndef LANG_GUJARATI
-# define LANG_GUJARATI 0x47
-# endif
-# ifndef LANG_HAUSA
-# define LANG_HAUSA 0x68
-# endif
-# ifndef LANG_HAWAIIAN
-# define LANG_HAWAIIAN 0x75
-# endif
-# ifndef LANG_HEBREW
-# define LANG_HEBREW 0x0d
-# endif
-# ifndef LANG_HINDI
-# define LANG_HINDI 0x39
-# endif
-# ifndef LANG_IBIBIO
-# define LANG_IBIBIO 0x69
-# endif
-# ifndef LANG_IGBO
-# define LANG_IGBO 0x70
-# endif
-# ifndef LANG_INDONESIAN
-# define LANG_INDONESIAN 0x21
-# endif
-# ifndef LANG_INUKTITUT
-# define LANG_INUKTITUT 0x5d
-# endif
-# ifndef LANG_KANNADA
-# define LANG_KANNADA 0x4b
-# endif
-# ifndef LANG_KANURI
-# define LANG_KANURI 0x71
-# endif
-# ifndef LANG_KASHMIRI
-# define LANG_KASHMIRI 0x60
-# endif
-# ifndef LANG_KAZAK
-# define LANG_KAZAK 0x3f
-# endif
-# ifndef LANG_KONKANI
-# define LANG_KONKANI 0x57
-# endif
-# ifndef LANG_KYRGYZ
-# define LANG_KYRGYZ 0x40
-# endif
-# ifndef LANG_LAO
-# define LANG_LAO 0x54
-# endif
-# ifndef LANG_LATIN
-# define LANG_LATIN 0x76
-# endif
-# ifndef LANG_LATVIAN
-# define LANG_LATVIAN 0x26
-# endif
-# ifndef LANG_LITHUANIAN
-# define LANG_LITHUANIAN 0x27
-# endif
-# ifndef LANG_MACEDONIAN
-# define LANG_MACEDONIAN 0x2f
-# endif
-# ifndef LANG_MALAY
-# define LANG_MALAY 0x3e
-# endif
-# ifndef LANG_MALAYALAM
-# define LANG_MALAYALAM 0x4c
-# endif
-# ifndef LANG_MALTESE
-# define LANG_MALTESE 0x3a
-# endif
-# ifndef LANG_MANIPURI
-# define LANG_MANIPURI 0x58
-# endif
-# ifndef LANG_MARATHI
-# define LANG_MARATHI 0x4e
-# endif
-# ifndef LANG_MONGOLIAN
-# define LANG_MONGOLIAN 0x50
-# endif
-# ifndef LANG_NEPALI
-# define LANG_NEPALI 0x61
-# endif
-# ifndef LANG_ORIYA
-# define LANG_ORIYA 0x48
-# endif
-# ifndef LANG_OROMO
-# define LANG_OROMO 0x72
-# endif
-# ifndef LANG_PAPIAMENTU
-# define LANG_PAPIAMENTU 0x79
-# endif
-# ifndef LANG_PASHTO
-# define LANG_PASHTO 0x63
-# endif
-# ifndef LANG_PUNJABI
-# define LANG_PUNJABI 0x46
-# endif
-# ifndef LANG_RHAETO_ROMANCE
-# define LANG_RHAETO_ROMANCE 0x17
-# endif
-# ifndef LANG_SAAMI
-# define LANG_SAAMI 0x3b
-# endif
-# ifndef LANG_SANSKRIT
-# define LANG_SANSKRIT 0x4f
-# endif
-# ifndef LANG_SERBIAN
-# define LANG_SERBIAN 0x1a
-# endif
-# ifndef LANG_SINDHI
-# define LANG_SINDHI 0x59
-# endif
-# ifndef LANG_SINHALESE
-# define LANG_SINHALESE 0x5b
-# endif
-# ifndef LANG_SLOVAK
-# define LANG_SLOVAK 0x1b
-# endif
-# ifndef LANG_SOMALI
-# define LANG_SOMALI 0x77
-# endif
-# ifndef LANG_SORBIAN
-# define LANG_SORBIAN 0x2e
-# endif
-# ifndef LANG_SUTU
-# define LANG_SUTU 0x30
-# endif
-# ifndef LANG_SWAHILI
-# define LANG_SWAHILI 0x41
-# endif
-# ifndef LANG_SYRIAC
-# define LANG_SYRIAC 0x5a
-# endif
-# ifndef LANG_TAGALOG
-# define LANG_TAGALOG 0x64
-# endif
-# ifndef LANG_TAJIK
-# define LANG_TAJIK 0x28
-# endif
-# ifndef LANG_TAMAZIGHT
-# define LANG_TAMAZIGHT 0x5f
-# endif
-# ifndef LANG_TAMIL
-# define LANG_TAMIL 0x49
-# endif
-# ifndef LANG_TATAR
-# define LANG_TATAR 0x44
-# endif
-# ifndef LANG_TELUGU
-# define LANG_TELUGU 0x4a
-# endif
-# ifndef LANG_THAI
-# define LANG_THAI 0x1e
-# endif
-# ifndef LANG_TIBETAN
-# define LANG_TIBETAN 0x51
-# endif
-# ifndef LANG_TIGRINYA
-# define LANG_TIGRINYA 0x73
-# endif
-# ifndef LANG_TSONGA
-# define LANG_TSONGA 0x31
-# endif
-# ifndef LANG_TSWANA
-# define LANG_TSWANA 0x32
-# endif
-# ifndef LANG_TURKMEN
-# define LANG_TURKMEN 0x42
-# endif
-# ifndef LANG_UKRAINIAN
-# define LANG_UKRAINIAN 0x22
-# endif
-# ifndef LANG_URDU
-# define LANG_URDU 0x20
-# endif
-# ifndef LANG_UZBEK
-# define LANG_UZBEK 0x43
-# endif
-# ifndef LANG_VENDA
-# define LANG_VENDA 0x33
-# endif
-# ifndef LANG_VIETNAMESE
-# define LANG_VIETNAMESE 0x2a
-# endif
-# ifndef LANG_WELSH
-# define LANG_WELSH 0x52
-# endif
-# ifndef LANG_XHOSA
-# define LANG_XHOSA 0x34
-# endif
-# ifndef LANG_YI
-# define LANG_YI 0x78
-# endif
-# ifndef LANG_YIDDISH
-# define LANG_YIDDISH 0x3d
-# endif
-# ifndef LANG_YORUBA
-# define LANG_YORUBA 0x6a
-# endif
-# ifndef LANG_ZULU
-# define LANG_ZULU 0x35
-# endif
-# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
-# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
-# endif
-# ifndef SUBLANG_ARABIC_IRAQ
-# define SUBLANG_ARABIC_IRAQ 0x02
-# endif
-# ifndef SUBLANG_ARABIC_EGYPT
-# define SUBLANG_ARABIC_EGYPT 0x03
-# endif
-# ifndef SUBLANG_ARABIC_LIBYA
-# define SUBLANG_ARABIC_LIBYA 0x04
-# endif
-# ifndef SUBLANG_ARABIC_ALGERIA
-# define SUBLANG_ARABIC_ALGERIA 0x05
-# endif
-# ifndef SUBLANG_ARABIC_MOROCCO
-# define SUBLANG_ARABIC_MOROCCO 0x06
-# endif
-# ifndef SUBLANG_ARABIC_TUNISIA
-# define SUBLANG_ARABIC_TUNISIA 0x07
-# endif
-# ifndef SUBLANG_ARABIC_OMAN
-# define SUBLANG_ARABIC_OMAN 0x08
-# endif
-# ifndef SUBLANG_ARABIC_YEMEN
-# define SUBLANG_ARABIC_YEMEN 0x09
-# endif
-# ifndef SUBLANG_ARABIC_SYRIA
-# define SUBLANG_ARABIC_SYRIA 0x0a
-# endif
-# ifndef SUBLANG_ARABIC_JORDAN
-# define SUBLANG_ARABIC_JORDAN 0x0b
-# endif
-# ifndef SUBLANG_ARABIC_LEBANON
-# define SUBLANG_ARABIC_LEBANON 0x0c
-# endif
-# ifndef SUBLANG_ARABIC_KUWAIT
-# define SUBLANG_ARABIC_KUWAIT 0x0d
-# endif
-# ifndef SUBLANG_ARABIC_UAE
-# define SUBLANG_ARABIC_UAE 0x0e
-# endif
-# ifndef SUBLANG_ARABIC_BAHRAIN
-# define SUBLANG_ARABIC_BAHRAIN 0x0f
-# endif
-# ifndef SUBLANG_ARABIC_QATAR
-# define SUBLANG_ARABIC_QATAR 0x10
-# endif
-# ifndef SUBLANG_AZERI_LATIN
-# define SUBLANG_AZERI_LATIN 0x01
-# endif
-# ifndef SUBLANG_AZERI_CYRILLIC
-# define SUBLANG_AZERI_CYRILLIC 0x02
-# endif
-# ifndef SUBLANG_BENGALI_INDIA
-# define SUBLANG_BENGALI_INDIA 0x01
-# endif
-# ifndef SUBLANG_BENGALI_BANGLADESH
-# define SUBLANG_BENGALI_BANGLADESH 0x02
-# endif
-# ifndef SUBLANG_CHINESE_MACAU
-# define SUBLANG_CHINESE_MACAU 0x05
-# endif
-# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
-# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
-# endif
-# ifndef SUBLANG_ENGLISH_JAMAICA
-# define SUBLANG_ENGLISH_JAMAICA 0x08
-# endif
-# ifndef SUBLANG_ENGLISH_CARIBBEAN
-# define SUBLANG_ENGLISH_CARIBBEAN 0x09
-# endif
-# ifndef SUBLANG_ENGLISH_BELIZE
-# define SUBLANG_ENGLISH_BELIZE 0x0a
-# endif
-# ifndef SUBLANG_ENGLISH_TRINIDAD
-# define SUBLANG_ENGLISH_TRINIDAD 0x0b
-# endif
-# ifndef SUBLANG_ENGLISH_ZIMBABWE
-# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
-# endif
-# ifndef SUBLANG_ENGLISH_PHILIPPINES
-# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
-# endif
-# ifndef SUBLANG_ENGLISH_INDONESIA
-# define SUBLANG_ENGLISH_INDONESIA 0x0e
-# endif
-# ifndef SUBLANG_ENGLISH_HONGKONG
-# define SUBLANG_ENGLISH_HONGKONG 0x0f
-# endif
-# ifndef SUBLANG_ENGLISH_INDIA
-# define SUBLANG_ENGLISH_INDIA 0x10
-# endif
-# ifndef SUBLANG_ENGLISH_MALAYSIA
-# define SUBLANG_ENGLISH_MALAYSIA 0x11
-# endif
-# ifndef SUBLANG_ENGLISH_SINGAPORE
-# define SUBLANG_ENGLISH_SINGAPORE 0x12
-# endif
-# ifndef SUBLANG_FRENCH_LUXEMBOURG
-# define SUBLANG_FRENCH_LUXEMBOURG 0x05
-# endif
-# ifndef SUBLANG_FRENCH_MONACO
-# define SUBLANG_FRENCH_MONACO 0x06
-# endif
-# ifndef SUBLANG_FRENCH_WESTINDIES
-# define SUBLANG_FRENCH_WESTINDIES 0x07
-# endif
-# ifndef SUBLANG_FRENCH_REUNION
-# define SUBLANG_FRENCH_REUNION 0x08
-# endif
-# ifndef SUBLANG_FRENCH_CONGO
-# define SUBLANG_FRENCH_CONGO 0x09
-# endif
-# ifndef SUBLANG_FRENCH_SENEGAL
-# define SUBLANG_FRENCH_SENEGAL 0x0a
-# endif
-# ifndef SUBLANG_FRENCH_CAMEROON
-# define SUBLANG_FRENCH_CAMEROON 0x0b
-# endif
-# ifndef SUBLANG_FRENCH_COTEDIVOIRE
-# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
-# endif
-# ifndef SUBLANG_FRENCH_MALI
-# define SUBLANG_FRENCH_MALI 0x0d
-# endif
-# ifndef SUBLANG_FRENCH_MOROCCO
-# define SUBLANG_FRENCH_MOROCCO 0x0e
-# endif
-# ifndef SUBLANG_FRENCH_HAITI
-# define SUBLANG_FRENCH_HAITI 0x0f
-# endif
-# ifndef SUBLANG_GERMAN_LUXEMBOURG
-# define SUBLANG_GERMAN_LUXEMBOURG 0x04
-# endif
-# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
-# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
-# endif
-# ifndef SUBLANG_KASHMIRI_INDIA
-# define SUBLANG_KASHMIRI_INDIA 0x02
-# endif
-# ifndef SUBLANG_MALAY_MALAYSIA
-# define SUBLANG_MALAY_MALAYSIA 0x01
-# endif
-# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
-# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
-# endif
-# ifndef SUBLANG_NEPALI_INDIA
-# define SUBLANG_NEPALI_INDIA 0x02
-# endif
-# ifndef SUBLANG_PUNJABI_INDIA
-# define SUBLANG_PUNJABI_INDIA 0x01
-# endif
-# ifndef SUBLANG_ROMANIAN_ROMANIA
-# define SUBLANG_ROMANIAN_ROMANIA 0x01
-# endif
-# ifndef SUBLANG_SERBIAN_LATIN
-# define SUBLANG_SERBIAN_LATIN 0x02
-# endif
-# ifndef SUBLANG_SERBIAN_CYRILLIC
-# define SUBLANG_SERBIAN_CYRILLIC 0x03
-# endif
-# ifndef SUBLANG_SINDHI_INDIA
-# define SUBLANG_SINDHI_INDIA 0x00
-# endif
-# ifndef SUBLANG_SINDHI_PAKISTAN
-# define SUBLANG_SINDHI_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_SPANISH_GUATEMALA
-# define SUBLANG_SPANISH_GUATEMALA 0x04
-# endif
-# ifndef SUBLANG_SPANISH_COSTA_RICA
-# define SUBLANG_SPANISH_COSTA_RICA 0x05
-# endif
-# ifndef SUBLANG_SPANISH_PANAMA
-# define SUBLANG_SPANISH_PANAMA 0x06
-# endif
-# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
-# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
-# endif
-# ifndef SUBLANG_SPANISH_VENEZUELA
-# define SUBLANG_SPANISH_VENEZUELA 0x08
-# endif
-# ifndef SUBLANG_SPANISH_COLOMBIA
-# define SUBLANG_SPANISH_COLOMBIA 0x09
-# endif
-# ifndef SUBLANG_SPANISH_PERU
-# define SUBLANG_SPANISH_PERU 0x0a
-# endif
-# ifndef SUBLANG_SPANISH_ARGENTINA
-# define SUBLANG_SPANISH_ARGENTINA 0x0b
-# endif
-# ifndef SUBLANG_SPANISH_ECUADOR
-# define SUBLANG_SPANISH_ECUADOR 0x0c
-# endif
-# ifndef SUBLANG_SPANISH_CHILE
-# define SUBLANG_SPANISH_CHILE 0x0d
-# endif
-# ifndef SUBLANG_SPANISH_URUGUAY
-# define SUBLANG_SPANISH_URUGUAY 0x0e
-# endif
-# ifndef SUBLANG_SPANISH_PARAGUAY
-# define SUBLANG_SPANISH_PARAGUAY 0x0f
-# endif
-# ifndef SUBLANG_SPANISH_BOLIVIA
-# define SUBLANG_SPANISH_BOLIVIA 0x10
-# endif
-# ifndef SUBLANG_SPANISH_EL_SALVADOR
-# define SUBLANG_SPANISH_EL_SALVADOR 0x11
-# endif
-# ifndef SUBLANG_SPANISH_HONDURAS
-# define SUBLANG_SPANISH_HONDURAS 0x12
-# endif
-# ifndef SUBLANG_SPANISH_NICARAGUA
-# define SUBLANG_SPANISH_NICARAGUA 0x13
-# endif
-# ifndef SUBLANG_SPANISH_PUERTO_RICO
-# define SUBLANG_SPANISH_PUERTO_RICO 0x14
-# endif
-# ifndef SUBLANG_SWEDISH_FINLAND
-# define SUBLANG_SWEDISH_FINLAND 0x02
-# endif
-# ifndef SUBLANG_TAMAZIGHT_ARABIC
-# define SUBLANG_TAMAZIGHT_ARABIC 0x01
-# endif
-# ifndef SUBLANG_TAMAZIGHT_LATIN
-# define SUBLANG_TAMAZIGHT_LATIN 0x02
-# endif
-# ifndef SUBLANG_TIGRINYA_ETHIOPIA
-# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
-# endif
-# ifndef SUBLANG_TIGRINYA_ERITREA
-# define SUBLANG_TIGRINYA_ERITREA 0x01
-# endif
-# ifndef SUBLANG_URDU_PAKISTAN
-# define SUBLANG_URDU_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_URDU_INDIA
-# define SUBLANG_URDU_INDIA 0x02
-# endif
-# ifndef SUBLANG_UZBEK_LATIN
-# define SUBLANG_UZBEK_LATIN 0x01
-# endif
-# ifndef SUBLANG_UZBEK_CYRILLIC
-# define SUBLANG_UZBEK_CYRILLIC 0x02
-# endif
-#endif /* HAVE_W32_SYSTEM */
-
-/* XPG3 defines the result of 'setlocale (category, NULL)' as:
-   "Directs 'setlocale()' to query 'category' and return the current
-    setting of 'local'."
-   However it does not specify the exact format.  Neither do SUSV2 and
-   ISO C 99.  So we can use this feature only on selected systems (e.g.
-   those using GNU C Library).  */
-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Determine the current locale's name, and canonicalize it into XPG syntax
-     language[_territory[.codeset]][@modifier]
-   The codeset part in the result is not reliable; the locale_charset()
-   should be used for codeset information instead.
-   The result must not be freed; it is statically allocated.  */
-
-static const char *
-_nl_locale_name (int category, const char *categoryname)
-{
-  const char *retval;
-
-#ifndef HAVE_W32_SYSTEM
-
-  /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
-     On some systems this can be done by the 'setlocale' function itself.  */
-# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  retval = setlocale (category, NULL);
-# else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval == NULL || retval[0] == '\0')
-    {
-      /* Next comes the name of the desired category.  */
-      retval = getenv (categoryname);
-      if (retval == NULL || retval[0] == '\0')
-	{
-	  /* Last possibility is the LANG environment variable.  */
-	  retval = getenv ("LANG");
-	  if (retval == NULL || retval[0] == '\0')
-	    /* We use C as the default domain.  POSIX says this is
-	       implementation defined.  */
-	    retval = "C";
-	}
-    }
-# endif
-
-  return retval;
-
-#else /* HAVE_W32_SYSTEM */
-
-  /* Return an XPG style locale name language[_territory][@modifier].
-     Don't even bother determining the codeset; it's not useful in this
-     context, because message catalogs are not specific to a single
-     codeset.  */
-
-  LCID lcid;
-  LANGID langid;
-  int primary, sub;
-
-  /* Let the user override the system settings through environment
-     variables, as on POSIX systems.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Use native Win32 API locale ID.  */
-  lcid = GetThreadLocale ();
-
-  /* Strip off the sorting rules, keep only the language part.  */
-  langid = LANGIDFROMLCID (lcid);
-
-  /* Split into language and territory part.  */
-  primary = PRIMARYLANGID (langid);
-  sub = SUBLANGID (langid);
-
-  /* Dispatch on language.
-     See also http://www.unicode.org/unicode/onlinedat/languages.html .
-     For details about languages, see http://www.ethnologue.com/ .  */
-  switch (primary)
-    {
-    case LANG_AFRIKAANS: return "af_ZA";
-    case LANG_ALBANIAN: return "sq_AL";
-    case LANG_AMHARIC: return "am_ET";
-    case LANG_ARABIC:
-      switch (sub)
-	{
-	case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
-	case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
-	case SUBLANG_ARABIC_EGYPT: return "ar_EG";
-	case SUBLANG_ARABIC_LIBYA: return "ar_LY";
-	case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
-	case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
-	case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
-	case SUBLANG_ARABIC_OMAN: return "ar_OM";
-	case SUBLANG_ARABIC_YEMEN: return "ar_YE";
-	case SUBLANG_ARABIC_SYRIA: return "ar_SY";
-	case SUBLANG_ARABIC_JORDAN: return "ar_JO";
-	case SUBLANG_ARABIC_LEBANON: return "ar_LB";
-	case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
-	case SUBLANG_ARABIC_UAE: return "ar_AE";
-	case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
-	case SUBLANG_ARABIC_QATAR: return "ar_QA";
-	}
-      return "ar";
-    case LANG_ARMENIAN: return "hy_AM";
-    case LANG_ASSAMESE: return "as_IN";
-    case LANG_AZERI:
-      switch (sub)
-	{
-	/* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
-	case SUBLANG_AZERI_LATIN: return "az_AZ at latin";
-	case SUBLANG_AZERI_CYRILLIC: return "az_AZ at cyrillic";
-	}
-      return "az";
-    case LANG_BASQUE:
-      return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
-    case LANG_BELARUSIAN: return "be_BY";
-    case LANG_BENGALI:
-      switch (sub)
-	{
-	case SUBLANG_BENGALI_INDIA: return "bn_IN";
-	case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
-	}
-      return "bn";
-    case LANG_BULGARIAN: return "bg_BG";
-    case LANG_BURMESE: return "my_MM";
-    case LANG_CAMBODIAN: return "km_KH";
-    case LANG_CATALAN: return "ca_ES";
-    case LANG_CHEROKEE: return "chr_US";
-    case LANG_CHINESE:
-      switch (sub)
-	{
-	case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
-	case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
-	case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
-	case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
-	case SUBLANG_CHINESE_MACAU: return "zh_MO";
-	}
-      return "zh";
-    case LANG_CROATIAN:		/* LANG_CROATIAN == LANG_SERBIAN
-				 * What used to be called Serbo-Croatian
-				 * should really now be two separate
-				 * languages because of political reasons.
-				 * (Says tml, who knows nothing about Serbian
-				 * or Croatian.)
-				 * (I can feel those flames coming already.)
-				 */
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "hr_HR";
-	case SUBLANG_SERBIAN_LATIN: return "sr_CS";
-	case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS at cyrillic";
-	}
-      return "hr";
-    case LANG_CZECH: return "cs_CZ";
-    case LANG_DANISH: return "da_DK";
-    case LANG_DIVEHI: return "div_MV";
-    case LANG_DUTCH:
-      switch (sub)
-	{
-	case SUBLANG_DUTCH: return "nl_NL";
-	case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
-	}
-      return "nl";
-    case LANG_EDO: return "bin_NG";
-    case LANG_ENGLISH:
-      switch (sub)
-	{
-	/* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
-	 * English was the language spoken in England.
-	 * Oh well.
-	 */
-	case SUBLANG_ENGLISH_US: return "en_US";
-	case SUBLANG_ENGLISH_UK: return "en_GB";
-	case SUBLANG_ENGLISH_AUS: return "en_AU";
-	case SUBLANG_ENGLISH_CAN: return "en_CA";
-	case SUBLANG_ENGLISH_NZ: return "en_NZ";
-	case SUBLANG_ENGLISH_EIRE: return "en_IE";
-	case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
-	case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
-	case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
-	case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
-	case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
-	case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
-	case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
-	case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
-	case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
-	case SUBLANG_ENGLISH_INDIA: return "en_IN";
-	case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
-	case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
-	}
-      return "en";
-    case LANG_ESTONIAN: return "et_EE";
-    case LANG_FAEROESE: return "fo_FO";
-    case LANG_FARSI: return "fa_IR";
-    case LANG_FINNISH: return "fi_FI";
-    case LANG_FRENCH:
-      switch (sub)
-	{
-	case SUBLANG_FRENCH: return "fr_FR";
-	case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
-	case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
-	case SUBLANG_FRENCH_SWISS: return "fr_CH";
-	case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
-	case SUBLANG_FRENCH_MONACO: return "fr_MC";
-	case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
-	case SUBLANG_FRENCH_REUNION: return "fr_RE";
-	case SUBLANG_FRENCH_CONGO: return "fr_CG";
-	case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
-	case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
-	case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
-	case SUBLANG_FRENCH_MALI: return "fr_ML";
-	case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
-	case SUBLANG_FRENCH_HAITI: return "fr_HT";
-	}
-      return "fr";
-    case LANG_FRISIAN: return "fy_NL";
-    case LANG_FULFULDE: return "ful_NG";
-    case LANG_GAELIC:
-      switch (sub)
-	{
-	case 0x01: /* SCOTTISH */ return "gd_GB";
-	case 0x02: /* IRISH */ return "ga_IE";
-	}
-      return "C";
-    case LANG_GALICIAN: return "gl_ES";
-    case LANG_GEORGIAN: return "ka_GE";
-    case LANG_GERMAN:
-      switch (sub)
-	{
-	case SUBLANG_GERMAN: return "de_DE";
-	case SUBLANG_GERMAN_SWISS: return "de_CH";
-	case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
-	case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
-	case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
-	}
-      return "de";
-    case LANG_GREEK: return "el_GR";
-    case LANG_GUARANI: return "gn_PY";
-    case LANG_GUJARATI: return "gu_IN";
-    case LANG_HAUSA: return "ha_NG";
-    case LANG_HAWAIIAN:
-      /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
-	 or Hawaii Creole English ("cpe_US", 600000 speakers)?  */
-      return "cpe_US";
-    case LANG_HEBREW: return "he_IL";
-    case LANG_HINDI: return "hi_IN";
-    case LANG_HUNGARIAN: return "hu_HU";
-    case LANG_IBIBIO: return "nic_NG";
-    case LANG_ICELANDIC: return "is_IS";
-    case LANG_IGBO: return "ibo_NG";
-    case LANG_INDONESIAN: return "id_ID";
-    case LANG_INUKTITUT: return "iu_CA";
-    case LANG_ITALIAN:
-      switch (sub)
-	{
-	case SUBLANG_ITALIAN: return "it_IT";
-	case SUBLANG_ITALIAN_SWISS: return "it_CH";
-	}
-      return "it";
-    case LANG_JAPANESE: return "ja_JP";
-    case LANG_KANNADA: return "kn_IN";
-    case LANG_KANURI: return "kau_NG";
-    case LANG_KASHMIRI:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "ks_PK";
-	case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
-	}
-      return "ks";
-    case LANG_KAZAK: return "kk_KZ";
-    case LANG_KONKANI:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "kok_IN";
-    case LANG_KOREAN: return "ko_KR";
-    case LANG_KYRGYZ: return "ky_KG";
-    case LANG_LAO: return "lo_LA";
-    case LANG_LATIN: return "la_VA";
-    case LANG_LATVIAN: return "lv_LV";
-    case LANG_LITHUANIAN: return "lt_LT";
-    case LANG_MACEDONIAN: return "mk_MK";
-    case LANG_MALAY:
-      switch (sub)
-	{
-	case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
-	case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
-	}
-      return "ms";
-    case LANG_MALAYALAM: return "ml_IN";
-    case LANG_MALTESE: return "mt_MT";
-    case LANG_MANIPURI:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "mni_IN";
-    case LANG_MARATHI: return "mr_IN";
-    case LANG_MONGOLIAN:
-      return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN".  */
-    case LANG_NEPALI:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "ne_NP";
-	case SUBLANG_NEPALI_INDIA: return "ne_IN";
-	}
-      return "ne";
-    case LANG_NORWEGIAN:
-      switch (sub)
-	{
-	case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
-	case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
-	}
-      return "no";
-    case LANG_ORIYA: return "or_IN";
-    case LANG_OROMO: return "om_ET";
-    case LANG_PAPIAMENTU: return "pap_AN";
-    case LANG_PASHTO:
-      return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF".  */
-    case LANG_POLISH: return "pl_PL";
-    case LANG_PORTUGUESE:
-      switch (sub)
-	{
-	case SUBLANG_PORTUGUESE: return "pt_PT";
-	/* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
-	   Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
-	case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
-	}
-      return "pt";
-    case LANG_PUNJABI:
-      switch (sub)
-	{
-	case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
-	}
-      return "pa";
-    case LANG_RHAETO_ROMANCE: return "rm_CH";
-    case LANG_ROMANIAN:
-      switch (sub)
-	{
-	case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
-	}
-      return "ro";
-    case LANG_RUSSIAN:
-      return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD".  */
-    case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
-    case LANG_SANSKRIT: return "sa_IN";
-    case LANG_SINDHI:
-      switch (sub)
-	{
-	case SUBLANG_SINDHI_INDIA: return "sd_IN";
-	case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
-	}
-      return "sd";
-    case LANG_SINHALESE: return "si_LK";
-    case LANG_SLOVAK: return "sk_SK";
-    case LANG_SLOVENIAN: return "sl_SI";
-    case LANG_SOMALI: return "so_SO";
-    case LANG_SORBIAN:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "wen_DE";
-    case LANG_SPANISH:
-      switch (sub)
-	{
-	case SUBLANG_SPANISH: return "es_ES";
-	case SUBLANG_SPANISH_MEXICAN: return "es_MX";
-	case SUBLANG_SPANISH_MODERN:
-	  return "es_ES at modern";	/* not seen on Unix */
-	case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
-	case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
-	case SUBLANG_SPANISH_PANAMA: return "es_PA";
-	case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
-	case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
-	case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
-	case SUBLANG_SPANISH_PERU: return "es_PE";
-	case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
-	case SUBLANG_SPANISH_ECUADOR: return "es_EC";
-	case SUBLANG_SPANISH_CHILE: return "es_CL";
-	case SUBLANG_SPANISH_URUGUAY: return "es_UY";
-	case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
-	case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
-	case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
-	case SUBLANG_SPANISH_HONDURAS: return "es_HN";
-	case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
-	case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
-	}
-      return "es";
-    case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
-    case LANG_SWAHILI: return "sw_KE";
-    case LANG_SWEDISH:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "sv_SE";
-	case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
-	}
-      return "sv";
-    case LANG_SYRIAC: return "syr_TR"; /* An extinct language.  */
-    case LANG_TAGALOG: return "tl_PH";
-    case LANG_TAJIK: return "tg_TJ";
-    case LANG_TAMAZIGHT:
-      switch (sub)
-	{
-	/* FIXME: Adjust this when Tamazight locales appear on Unix.  */
-	case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA at arabic";
-	case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA at latin";
-	}
-      return "ber_MA";
-    case LANG_TAMIL:
-      return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
-    case LANG_TATAR: return "tt_RU";
-    case LANG_TELUGU: return "te_IN";
-    case LANG_THAI: return "th_TH";
-    case LANG_TIBETAN: return "bo_CN";
-    case LANG_TIGRINYA:
-      switch (sub)
-	{
-	case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
-	case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
-	}
-      return "ti";
-    case LANG_TSONGA: return "ts_ZA";
-    case LANG_TSWANA: return "tn_BW";
-    case LANG_TURKISH: return "tr_TR";
-    case LANG_TURKMEN: return "tk_TM";
-    case LANG_UKRAINIAN: return "uk_UA";
-    case LANG_URDU:
-      switch (sub)
-	{
-	case SUBLANG_URDU_PAKISTAN: return "ur_PK";
-	case SUBLANG_URDU_INDIA: return "ur_IN";
-	}
-      return "ur";
-    case LANG_UZBEK:
-      switch (sub)
-	{
-	case SUBLANG_UZBEK_LATIN: return "uz_UZ";
-	case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ at cyrillic";
-	}
-      return "uz";
-    case LANG_VENDA:
-      /* FIXME: It's not clear whether Venda has the ISO 639-2 two-letter code
-	 "ve" or not.
-	 http://www.loc.gov/standards/iso639-2/englangn.html has it, but
-	 http://lcweb.loc.gov/standards/iso639-2/codechanges.html doesn't,  */
-      return "ven_ZA"; /* or "ve_ZA"? */
-    case LANG_VIETNAMESE: return "vi_VN";
-    case LANG_WELSH: return "cy_GB";
-    case LANG_XHOSA: return "xh_ZA";
-    case LANG_YI: return "sit_CN";
-    case LANG_YIDDISH: return "yi_IL";
-    case LANG_YORUBA: return "yo_NG";
-    case LANG_ZULU: return "zu_ZA";
-    default: return "C";
-    }
-
-#endif /* HAVE_W32_SYSTEM */
-}
-
-/* localname.c from gettext END.  */
-

-/* Support functions.  */
-
-typedef uint32_t u32;
-typedef unsigned long ulong;
-
-static __inline__ u32
-do_swap_u32 (u32 i)
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-
-#define SWAPIT(flag, data) ((flag) ? do_swap_u32(data) : (data))
-
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-/* The so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-
-static __inline__ ulong
-hash_string( const char *str_param )
-{
-    unsigned long int hval, g;
-    const char *str = str_param;
-
-    hval = 0;
-    while (*str != '\0')
-    {
-	hval <<= 4;
-	hval += (unsigned long int) *str++;
-	g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-	if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-    return hval;
-}
-
-

-/* Generic message catalog and gettext stuff.  */
-
-/* The magic number of the GNU message catalog format.	*/
-#define MAGIC	      0x950412de
-#define MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.	*/
-  u32 magic;
-  /* The revision number of the file format.  */
-  u32 revision;
-  /* The number of strings pairs.  */
-  u32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  u32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  u32 trans_tab_offset;
-  /* Size of hashing table.  */
-  u32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  u32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  u32 length;
-  /* Offset of string in file.	*/
-  u32 offset;
-};
-
-
-struct overflow_space_s
-{
-  struct overflow_space_s *next;
-  u32 idx;
-  char d[1];
-};
-
-struct loaded_domain
-{
-  char *data;
-  int must_swap;
-  u32 nstrings;
-  char *mapped;  /* 0 = not yet mapped, 1 = mapped,
-                    2 = mapped to
-                    overflow space */
-  struct overflow_space_s *overflow_space;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
-  u32 hash_size;
-  u32 *hash_tab;
-};
-
-

-/* Free the domain data.  */
-static void
-free_domain (struct loaded_domain *domain)
-{
-  struct overflow_space_s *os, *os2;
-  free (domain->data);
-  free (domain->mapped);
-  for (os = domain->overflow_space; os; os = os2)
-    {
-      os2 = os->next;
-      free (os);
-    }
-  free (domain);
-}
-
-
-/* The gettext implementation; support functions.  */
-static struct loaded_domain *
-load_domain (const char *filename)
-{
-  FILE *fp;
-  size_t size;
-  struct stat st;
-  struct mo_file_header *data = NULL;
-  struct loaded_domain *domain = NULL;
-  size_t to_read;
-  char *read_ptr;
-
-  fp = fopen (filename, "rb");
-  if (!fp)
-    return NULL;
-
-  /* Determine the file size.  */
-  if (fstat (fileno (fp), &st)
-      || (size = (size_t) st.st_size) != st.st_size
-      || size < sizeof (struct mo_file_header))
-    {
-      fclose (fp);
-      return NULL;
-    }
-
-  data = malloc (size);
-  if (!data)
-    {
-      fclose (fp);
-      return NULL;
-    }
-
-  to_read = size;
-  read_ptr = (char *) data;
-  do
-    {
-      long int nb = fread (read_ptr, 1, to_read, fp);
-      if (nb < to_read)
-	{
-	  fclose (fp);
-	  free (data);
-	  return NULL;
-	}
-      read_ptr += nb;
-      to_read -= nb;
-    }
-  while (to_read > 0);
-  fclose (fp);
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (data->magic != MAGIC && data->magic != MAGIC_SWAPPED)
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-      free (data);
-      return NULL;
-    }
-
-  domain = calloc (1, sizeof *domain);
-  if (!domain)
-    {
-      free (data);
-      return NULL;
-    }
-  domain->data = (char *) data;
-  domain->must_swap = data->magic != MAGIC;
-
-  /* Fill in the information about the available tables.  */
-  switch (SWAPIT (domain->must_swap, data->revision))
-    {
-    case 0:
-
-      domain->nstrings = SWAPIT (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
-	((char *) data + SWAPIT (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
-	((char *) data + SWAPIT (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = SWAPIT (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (u32 *)
-	((char *) data + SWAPIT (domain->must_swap, data->hash_tab_offset));
-      break;
-
-    default:
-      /* This is an invalid revision.	*/
-      free (data);
-      free (domain);
-      return NULL;
-    }
-
-  /* Allocate an array to keep track of code page mappings.  */
-  domain->mapped = calloc (1, domain->nstrings);
-  if (!domain->mapped)
-    {
-      free (data);
-      free (domain);
-      return NULL;
-    }
-
-  return domain;
-}
-
-
-/* Return a malloced string encoded in UTF-8 from the wide char input
-   string STRING.  Caller must free this value. On failure returns
-   NULL; caller may use GetLastError to get the actual error number.
-   The result of calling this function with STRING set to NULL is not
-   defined. */
-static char *
-wchar_to_native (const wchar_t *string)
-{
-  int n;
-  char *result;
-
-  n = WideCharToMultiByte (CP_ACP, 0, string, -1, NULL, 0, NULL, NULL);
-  if (n < 0)
-    return NULL;
-
-  result = malloc (n+1);
-  if (!result)
-    return NULL;
-
-  n = WideCharToMultiByte (CP_ACP, 0, string, -1, result, n, NULL, NULL);
-  if (n < 0)
-    {
-      free (result);
-      return NULL;
-    }
-  return result;
-}
-
-
-static wchar_t *
-native_to_wchar (const char *string)
-{
-  int n;
-  wchar_t *result;
-
-  n = MultiByteToWideChar (CP_ACP, 0, string, -1, NULL, 0);
-  if (n < 0)
-    return NULL;
-
-  result = malloc ((n+1) * sizeof *result);
-  if (!result)
-    return NULL;
-
-  n = MultiByteToWideChar (CP_ACP, 0, string, -1, result, n);
-  if (n < 0)
-    {
-      free (result);
-      return NULL;
-    }
-  return result;
-}
-
-
-/* Return a malloced wide char string from an UTF-8 encoded input
-   string STRING.  Caller must free this value. On failure returns
-   NULL; caller may use GetLastError to get the actual error number.
-   The result of calling this function with STRING set to NULL is not
-   defined. */
-wchar_t *
-utf8_to_wchar (const char *string)
-{
-  int n;
-  wchar_t *result;
-
-  n = MultiByteToWideChar (CP_UTF8, 0, string, -1, NULL, 0);
-  if (n < 0)
-    return NULL;
-
-  result = malloc ((n+1) * sizeof *result);
-  if (!result)
-    return NULL;
-
-  n = MultiByteToWideChar (CP_UTF8, 0, string, -1, result, n);
-  if (n < 0)
-    {
-      free (result);
-      return NULL;
-    }
-  return result;
-}
-
-
-/* Return a malloced string encoded in UTF-8 from the wide char input
-   string STRING.  Caller must free this value. On failure returns
-   NULL; caller may use GetLastError to get the actual error number.
-   The result of calling this function with STRING set to NULL is not
-   defined. */
-char *
-wchar_to_utf8 (const wchar_t *string)
-{
-  int n;
-  char *result;
-
-  /* Note, that CP_UTF8 is not defined in Windows versions earlier
-     than NT.*/
-  n = WideCharToMultiByte (CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL);
-  if (n < 0)
-    return NULL;
-
-  result = malloc (n + 1);
-  if (!result)
-    return NULL;
-
-  n = WideCharToMultiByte (CP_UTF8, 0, string, -1, result, n, NULL, NULL);
-  if (n < 0)
-    {
-      free (result);
-      return NULL;
-    }
-  return result;
-}
-
-
-/* Convert UTF8 to the native codepage.  This function is guaranteed
-   to never return NULL.  Caller must free the return value.  */
-char *
-utf8_to_native (const char *string)
-{
-  wchar_t *wstring;
-  char *result;
-
-  wstring = utf8_to_wchar (string);
-  if (!wstring)
-    return strdup ("[Error: utf8_to_wchar failed]");
-
-  result = wchar_to_native (wstring);
-  free (wstring);
-  if (!result)
-    result = strdup ("[Error: wchar_to_native failed]");
-
-  return result;
-}
-
-
-/* Convert native character set to utf-8.  This is required if we want
-   to get an utf-8 string from a gettext translated function which
-   internally uses utf8_to_native.  It is guaranteed that NULL is
-   never returned.  Caller must free the return value.  */
-char *
-native_to_utf8 (const char *string)
-{
-  char *result;
-  wchar_t *wstring;
-
-  wstring = native_to_wchar (string);
-  if (!wstring)
-    return strdup ("[Error: native_to_wchar failed]");
-
-  result = wchar_to_utf8 (wstring);
-  free (wstring);
-  if (!result)
-    result = strdup ("[Error: wchar_to_utf8 failed]");
-
-  return result;
-}
-
-
-
-static const char*
-get_string (struct loaded_domain *domain, u32 idx)
-{
-  struct overflow_space_s *os;
-  char *p;
-
-  p = domain->data + SWAPIT (domain->must_swap, domain->trans_tab[idx].offset);
-  if (!domain->mapped[idx])
-    {
-      size_t plen, buflen;
-      char *buf;
-
-      domain->mapped[idx] = 1;
-
-      plen = strlen (p);
-      buf = utf8_to_native (p);
-      buflen = strlen (buf);
-      if (buflen <= plen)
-        strcpy (p, buf);
-      else
-        {
-          /* There is not enough space for the translation - store it
-             in the overflow_space else and mark that in the mapped
-             array.  Because we expect that this won't happen too
-             often, we use a simple linked list.  */
-          os = malloc (sizeof *os + buflen);
-          if (os)
-            {
-              os->idx = idx;
-              strcpy (os->d, buf);
-              os->next = domain->overflow_space;
-              domain->overflow_space = os;
-              p = os->d;
-            }
-          else
-            p = "ERROR in GETTEXT MALLOC";
-        }
-      free (buf);
-    }
-  else if (domain->mapped[idx] == 2)
-    {
-      /* We need to get the string from the overflow_space.  */
-      for (os=domain->overflow_space; os; os = os->next)
-        if (os->idx == idx)
-          return (const char*) os->d;
-      p = "ERROR in GETTEXT\n";
-    }
-  return (const char*) p;
-}
-
-

-
-/* The domain we use.  We only support one domain at this point.  This
-   is why this implementation can not be shared.  Bindtextdomain and
-   dgettext will simply cheat and always use this one domain.  */
-static struct loaded_domain *the_domain;
-
-

-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-bindtextdomain (const char *domainname, const char *dirname)
-{
-  struct loaded_domain *domain = NULL;
-  const char *catval_full;
-  char *catval;
-  char *fname;
-
-  /* DOMAINNAME is ignored.  We only support one domain.  */
-
-  /* DIRNAME is "$INSTALLDIR\share\locale".  */
-
-  /* First found out the category value.  */
-  catval = NULL;
-  catval_full = _nl_locale_name (LC_MESSAGES, "LC_MESSAGES");
-
-  /* Normally, we would have to loop over all returned locales, and
-     search for the right file.  See gettext intl/dcigettext.c for all
-     the gory details.  Here, we only support the basic category, and
-     ignore everything else.  */
-  if (catval_full)
-    {
-      char *p;
-
-      catval = malloc (strlen (catval_full) + 1);
-      if (catval)
-	{
-	  strcpy (catval, catval_full);
-	  p = strchr (catval, '_');
-	  if (p)
-	    *p = '\0';
-	}
-    }
-  if (!catval)
-    return NULL;
-
-  /* Now build the filename string.  The complete filename is this:
-     DIRNAME + \ + CATVAL + \LC_MESSAGES\ + DOMAINNAME + .mo  */
-  {
-    int len = strlen (dirname) + 1 + strlen (catval) + 13
-      + strlen (domainname) + 3 + 1;
-    char *p;
-
-    fname = malloc (len);
-    if (!fname)
-      {
-	free (catval);
-	return NULL;
-      }
-
-    p = fname;
-    strcpy (p, dirname);
-    p += strlen (dirname);
-    *(p++) = '\\';
-    strcpy (p, catval);
-    p += strlen (catval);
-    strcpy (p, "\\LC_MESSAGES\\");
-    p += 13;
-    strcpy (p, domainname);
-    p += strlen (domainname);
-    strcpy (p, ".mo");
-  }
-
-  domain = load_domain (fname);
-  free (catval);
-  free (fname);
-
-  /* We should not be invoked twice, but this is how you would do
-     it if it happened.  */
-  if (the_domain)
-    free_domain (the_domain);
-  the_domain = domain;
-
-  /* For historic reasoins we are not allowed to return a const char*. */
-  return (char*)dirname;
-}
-
-
-const char *
-gettext (const char *msgid)
-{
-  struct loaded_domain *domain;
-  size_t act = 0;
-  size_t top, bottom;
-
-  if (!(domain = the_domain))
-    goto not_found;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab)
-    {
-      /* Use the hashing table.  */
-      u32 len = strlen (msgid);
-      u32 hash_val = hash_string (msgid);
-      u32 idx = hash_val % domain->hash_size;
-      u32 incr = 1 + (hash_val % (domain->hash_size - 2));
-      u32 nstr = SWAPIT (domain->must_swap, domain->hash_tab[idx]);
-
-      if (!nstr)
-	/* Hash table entry is empty.  */
-	goto not_found;
-
-      if (SWAPIT (domain->must_swap,
-		  domain->orig_tab[nstr - 1].length) == len
-	  && !strcmp (msgid,
-		      domain->data
-		      + SWAPIT (domain->must_swap,
-				domain->orig_tab[nstr - 1].offset)))
-	return get_string (domain, nstr - 1);
-
-	for(;;)
-	  {
-	    if (idx >= domain->hash_size - incr)
-	      idx -= domain->hash_size - incr;
-	    else
-	      idx += incr;
-
-	    nstr = SWAPIT (domain->must_swap, domain->hash_tab[idx]);
-	    if (!nstr)
-	      /* Hash table entry is empty.  */
-	      goto not_found;
-
-	    if (SWAPIT (domain->must_swap,
-			domain->orig_tab[nstr - 1].length) == len
-		&& !strcmp (msgid,
-			    domain->data
-			    + SWAPIT (domain->must_swap,
-				      domain->orig_tab[nstr - 1].offset)))
-	      return get_string (domain, nstr-1);
-	  }
-	/* NOTREACHED */
-    }
-
-  /* Now we try the default method: binary search in the sorted array
-     of messages.  */
-  bottom = 0;
-  top = domain->nstrings;
-  while (bottom < top)
-    {
-      int cmp_val;
-
-      act = (bottom + top) / 2;
-      cmp_val = strcmp(msgid, domain->data
-		       + SWAPIT (domain->must_swap,
-				 domain->orig_tab[act].offset));
-      if (cmp_val < 0)
-	top = act;
-      else if (cmp_val > 0)
-	bottom = act + 1;
-      else
-	return get_string (domain, act);
-    }
- not_found:
-  return msgid;
-}
-
-
-char *
-textdomain (const char *domainname)
-{
-  /* For now, support only one domain.  */
-  return (char*)domainname;
-}
-
-char *
-dgettext (const char *domainname, const char *msgid)
-{
-  /* For now, support only one domain.  */
-  return (char*)gettext (msgid);
-}
-
-/* Return the locale name as used by gettext.  The return value will
-   never be NULL. */
-const char *
-gettext_localename (void)
-{
-  const char *s;
-
-  s = _nl_locale_name (LC_MESSAGES, "LC_MESSAGES");
-  return s? s:"";
-}
diff --git a/src/w32-gettext.h b/src/w32-gettext.h
deleted file mode 100644
index e8cd0fa..0000000
--- a/src/w32-gettext.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* w32-gettext.h - A simple gettext implementation for Windows targets.
-   Copyright (C) 2005 g10 Code GmbH
-
-   This file is part of libgpg-error.
-
-   libgpg-error is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-
-   libgpg-error is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with libgpg-error; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#ifndef W32_GETTEXT_H
-#define W32_GETTEXT_H
-
-#if ENABLE_NLS
-
-#include <locale.h>
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0
-}
-#endif
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *bindtextdomain (const char *domainname, const char *dirname);
-
-const char *gettext (const char *msgid);
-
-char *textdomain (const char *domainname);
-
-char *dgettext (const char *domainname, const char *msgid);
-
-/* Return the localname as used by gettext.  The return value will
-   never be NULL. */
-const char *gettext_localename (void);
-
-/* A pseudo function call that serves as a marker for the automated
-   extraction of messages, but does not call gettext().  The run-time
-   translation is done at a different place in the code.
-   The argument, String, should be a literal string.  Concatenated strings
-   and other string expressions won't work.
-   The macro's expansion is not parenthesized, so that it is suitable as
-   initializer for static 'char[]' or 'const char[]' variables.  */
-#define gettext_noop(String) String
-
-
-#else	/* ENABLE_NLS */
-
-static inline const char *gettext_localename (void) { return ""; }
-
-
-#endif	/* !ENABLE_NLS */
-
-/* Conversion function. */
-char *wchar_to_utf8 (const wchar_t *string);
-wchar_t *utf8_to_wchar (const char *string);
-
-char *utf8_to_native (const char *string);
-char *native_to_utf8 (const char *string);
-
-#ifdef __cplusplus
-#if 0
-{
-#endif
-}
-#endif
-
-#endif	/* ! W32_GETTEXT_H */

-----------------------------------------------------------------------

Summary of changes:
 NEWS              |    2 +
 configure.ac      |    3 +
 src/ChangeLog     |   25 +-
 src/Makefile.am   |    1 -
 src/client.cc     |  119 +++--
 src/gpgex.cc      |  112 +++--
 src/main.cc       |  146 ++++-
 src/main.h        |   25 +-
 src/w32-gettext.c | 1796 -----------------------------------------------------
 src/w32-gettext.h |   84 ---
 10 files changed, 321 insertions(+), 1992 deletions(-)
 delete mode 100644 src/w32-gettext.c
 delete mode 100644 src/w32-gettext.h


hooks/post-receive
-- 
GnupG extension for the Windows Explorer
http://git.gnupg.org




More information about the Gnupg-commits mailing list