diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ChangeLog | 7 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 15 | ||||
| -rw-r--r-- | tools/gpgconf.c | 7 |
3 files changed, 22 insertions, 7 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 1eefac53a..c18562f01 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,10 @@ +2004-10-01 Werner Koch <[email protected]> + + * gpgconf-comp.c (my_dgettext): Also switch codeset and directory + for the other used domains (i.e. dirmngr). + + * gpgconf.c (main): Fixed translation markers. + 2004-09-30 Werner Koch <[email protected]> * gpgconf.c (i18n_init): Always use LC_ALL. diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index b140db76e..e69b177e4 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -364,7 +364,10 @@ struct gc_option and options. Note that we try to keep the description of groups within the - gnupg domain. */ + gnupg domain. + + IMPORTANT: If you add a new domain please make sure to add a code + set switching call to the function my_dgettext further below. */ const char *desc_domain; /* A gettext description for this group or option. If it starts @@ -454,7 +457,7 @@ static gc_option_t gc_options_gpg_agent[] = "gnupg", "|LEVEL|set the debugging level to LEVEL", GC_ARG_TYPE_STRING, GC_BACKEND_GPG_AGENT }, { "log-file", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED, - "gnupg", "|FILE|write logs to FILE", + "gnupg", N_("|FILE|write server mode logs to FILE"), GC_ARG_TYPE_PATHNAME, GC_BACKEND_GPG_AGENT }, { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, NULL, NULL, @@ -760,7 +763,7 @@ static gc_option_t gc_options_dirmngr[] = "dirmngr", "allow sending OCSP requests", GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR }, { "ocsp-responder", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, - "dirmngr", "|URL|use OCSP responder URL", + "dirmngr", "|URL|use OCSP responder at URL", GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR }, { "ocsp-signer", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, "dirmngr", "|FPR|OCSP response signed by FPR", @@ -874,8 +877,12 @@ my_dgettext (const char *domain, const char *msgid) if (!switched_codeset) { - bind_textdomain_codeset (PACKAGE_GT, "utf-8"); switched_codeset = 1; + bind_textdomain_codeset (PACKAGE_GT, "utf-8"); + + bindtextdomain ("dirmngr", LOCALEDIR); + bind_textdomain_codeset ("dirmngr", "utf-8"); + } /* Note: This is a hack to actually use the gnupg2 domain as diff --git a/tools/gpgconf.c b/tools/gpgconf.c index e3e1b9f1a..dd505e99d 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -172,8 +172,9 @@ main (int argc, char **argv) case aChangeOptions: if (!fname) { - fputs (N_("usage: gpgconf [options] "), stderr); - fputs (N_("Need one component argument"), stderr); + fputs (_("usage: gpgconf [options] "), stderr); + putc ('\n',stderr); + fputs (_("Need one component argument"), stderr); putc ('\n',stderr); exit (2); } @@ -182,7 +183,7 @@ main (int argc, char **argv) int idx = gc_component_find (fname); if (idx < 0) { - fputs (N_("Component not found"), stderr); + fputs (_("Component not found"), stderr); putc ('\n', stderr); exit (1); } |