aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/ChangeLog4
-rw-r--r--common/i18n.c1
-rw-r--r--g10/ChangeLog3
-rw-r--r--g10/verify.c2
-rw-r--r--tools/gpgconf.c3
5 files changed, 12 insertions, 1 deletions
diff --git a/common/ChangeLog b/common/ChangeLog
index 156cfa1cb..7116b0225 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-20 Werner Koch <[email protected]>
+
+ * i18n.c (i18n_init) [USE_SIMPLE_GETTEXT]: Call textdomain.
+
2010-10-14 Werner Koch <[email protected]>
* asshelp.c (start_new_gpg_agent): Print a notice once the agent
diff --git a/common/i18n.c b/common/i18n.c
index 7601cf8bd..d0d804a32 100644
--- a/common/i18n.c
+++ b/common/i18n.c
@@ -34,6 +34,7 @@ i18n_init (void)
{
#ifdef USE_SIMPLE_GETTEXT
bindtextdomain (PACKAGE_GT, gnupg_localedir ());
+ textdomain (PACKAGE_GT);
#else
# ifdef ENABLE_NLS
setlocale (LC_ALL, "" );
diff --git a/g10/ChangeLog b/g10/ChangeLog
index d475d6edd..ca67352cf 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
2010-10-20 Werner Koch <[email protected]>
+ * 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
diff --git a/g10/verify.c b/g10/verify.c
index 0810223d0..925618c67 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -96,7 +96,7 @@ verify_signatures (ctrl_t ctrl, int nfiles, char **files )
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);
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index d6c333792..59c903165 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -189,6 +189,9 @@ main (int argc, char **argv)
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;