[svn] GnuPG - r5462 - in trunk: common g10 tools

[svn author wk]

Author: wk
Date: 2010-10-20 17:06:50 +0200 (Wed, 20 Oct 2010)
New Revision: 5462

Modified:
   trunk/common/ChangeLog
   trunk/common/i18n.c
   trunk/g10/ChangeLog
   trunk/g10/verify.c
   trunk/tools/gpgconf.c
Log:
Enable i18n for W32.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2010-10-20 11:33:50 UTC (rev 5461)
+++ trunk/common/ChangeLog	2010-10-20 15:06:50 UTC (rev 5462)
@@ -1,3 +1,7 @@
+2010-10-20  Werner Koch  <wk at g10code.com>
+
+	* i18n.c (i18n_init) [USE_SIMPLE_GETTEXT]: Call textdomain.
+
 2010-10-14  Werner Koch  <wk at g10code.com>
 
 	* asshelp.c (start_new_gpg_agent): Print a notice once the agent

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2010-10-20 11:33:50 UTC (rev 5461)
+++ trunk/g10/ChangeLog	2010-10-20 15:06:50 UTC (rev 5462)
@@ -1,5 +1,8 @@
 2010-10-20  Werner Koch  <wk at g10code.com>
 
+	* verify.c (verify_signatures): Use gpg_strerror on open failure
+	for consistency of error messages.
+
 	* packet.h (PKT_public_key): s/mdc_feature/flags.mdc/.  Change all
 	users.
 	(PKT_public_key): Split is_disabled into flags.disabled_valid and

Modified: trunk/common/i18n.c
===================================================================
--- trunk/common/i18n.c	2010-10-20 11:33:50 UTC (rev 5461)
+++ trunk/common/i18n.c	2010-10-20 15:06:50 UTC (rev 5462)
@@ -34,6 +34,7 @@
 {
 #ifdef USE_SIMPLE_GETTEXT
   bindtextdomain (PACKAGE_GT, gnupg_localedir ());
+  textdomain (PACKAGE_GT);
 #else
 # ifdef ENABLE_NLS
   setlocale (LC_ALL, "" );

Modified: trunk/g10/verify.c
===================================================================
--- trunk/g10/verify.c	2010-10-20 11:33:50 UTC (rev 5461)
+++ trunk/g10/verify.c	2010-10-20 15:06:50 UTC (rev 5462)
@@ -96,7 +96,7 @@
     if( !fp ) {
         rc = gpg_error_from_syserror ();
 	log_error(_("can't open `%s': %s\n"),
-                  print_fname_stdin(sigfile), strerror (errno));
+                  print_fname_stdin(sigfile), gpg_strerror (rc));
         goto leave;
     }
     handle_progress (pfx, fp, sigfile);

Modified: trunk/tools/gpgconf.c
===================================================================
--- trunk/tools/gpgconf.c	2010-10-20 11:33:50 UTC (rev 5461)
+++ trunk/tools/gpgconf.c	2010-10-20 15:06:50 UTC (rev 5462)
@@ -189,6 +189,9 @@
 
   if (log_get_errorcount (0))
     exit (2);
+
+  fprintf (stderr, "My error: %d (%s)\n", GPG_ERR_ENOENT,
+           gpg_strerror (GPG_ERR_ENOENT));
   
   fname = argc ? *argv : NULL;