summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-01-22 13:06:00 +0100
committerWerner Koch <wk@gnupg.org>2008-01-22 13:06:00 +0100
commitfefc0da6e90759233a313b837c852183bdd880c7 (patch)
treed769544a728060619c8dbb277d30de8d53027cbf /tools
parent2008-01-17 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-fefc0da6e90759233a313b837c852183bdd880c7.tar.xz
gnupg2-fefc0da6e90759233a313b837c852183bdd880c7.zip
translation fixes
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog7
-rw-r--r--tools/gpgconf-comp.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index ec31d3b37..469b5431a 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-22 Werner Koch <wk@g10code.com>
+
+ * gpgconf-comp.c: Use gnupg domain for honor-http-proxy. Make
+ "LDAP server list" group title translatable.
+
2008-01-17 Marcus Brinkmann <marcus@g10code.de>
* gpgconf-comp.c (change_options_program): Strip duplicated
@@ -844,7 +849,7 @@
* watchgnupg.c: New.
- Copyright 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 4cd38b54a..7470f421f 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1,5 +1,5 @@
/* gpgconf-comp.c - Configuration utility for GnuPG.
- * Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -840,7 +840,7 @@ static gc_option_t gc_options_dirmngr[] =
"dirmngr", "|URL|redirect all HTTP requests to URL",
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
{ "honor-http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
- "dirmngr", N_("use system's HTTP proxy setting"),
+ "gnupg", N_("use system's HTTP proxy setting"),
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
{ "LDAP",
@@ -874,7 +874,7 @@ static gc_option_t gc_options_dirmngr[] =
GC_BACKEND_DIRMNGR in this component, so that the entry for
"ldapserverlist-file will be initialized before this one. */
{ "LDAP Server", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
- NULL, "LDAP server list",
+ "gnupg", N_("LDAP server list"),
GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST },
{ "max-replies", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
"dirmngr", "|N|do not return more than N items in one query",