[svn] dirmngr - r242 - in trunk: . jnlib m4 po src
svn author wk
cvs at cvs.gnupg.org
Wed Nov 29 14:47:18 CET 2006
Author: wk
Date: 2006-11-29 14:47:15 +0100 (Wed, 29 Nov 2006)
New Revision: 242
Removed:
trunk/intl/
trunk/jnlib/utf8conv.c
trunk/jnlib/utf8conv.h
Modified:
trunk/AUTHORS
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/README
trunk/TODO
trunk/configure.ac
trunk/jnlib/ChangeLog
trunk/jnlib/Makefile.am
trunk/jnlib/argparse.c
trunk/jnlib/libjnlib-config.h
trunk/jnlib/stringhelp.c
trunk/m4/Makefile
trunk/m4/Makefile.in
trunk/po/de.po
trunk/po/dirmngr.pot
trunk/src/ChangeLog
trunk/src/Makefile.am
trunk/src/dirmngr-client.c
trunk/src/dirmngr.c
trunk/src/dirmngr_ldap.c
Log:
Prepared the 1.0.0 release.
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/AUTHORS 2006-11-29 13:47:15 UTC (rev 242)
@@ -24,7 +24,7 @@
src/cdblib.h which are in the public domain.
- Copyright 2003, 2004 g10 Code GmbH
+ Copyright 2003, 2004, 2006 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/ChangeLog 2006-11-29 13:47:15 UTC (rev 242)
@@ -1,3 +1,13 @@
+2006-11-29 Werner Koch <wk at g10code.com>
+
+ Released 1.0.0.
+
+ * configure.ac: Use SVN magic for version numbers.
+ (AM_GNU_GETTEXT): Use external flag.
+ (COPYRIGHT_YEAR_NAME): New.
+ * intl/: Removed directory
+ * Makefile.am (SUBDIRS): Removed intl.
+
2006-11-17 Werner Koch <wk at g10code.com>
Released 0.9.7.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/Makefile.am 2006-11-29 13:47:15 UTC (rev 242)
@@ -24,5 +24,5 @@
EXTRA_DIST = config.rpath autogen.sh
-SUBDIRS = m4 intl jnlib src po doc tests
+SUBDIRS = m4 jnlib src po doc tests
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/NEWS 2006-11-29 13:47:15 UTC (rev 242)
@@ -1,3 +1,12 @@
+Noteworthy changes in version 1.0 0 (2006-11-29)
+------------------------------------------------
+
+ * Bumbed the version number.
+
+ * Removed included gettext. We now require the system to provide a
+ suitable installation.
+
+
Noteworthy changes in version 0.9.7 (2006-11-17)
------------------------------------------------
Modified: trunk/README
===================================================================
--- trunk/README 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/README 2006-11-29 13:47:15 UTC (rev 242)
@@ -1,7 +1,7 @@
Dirmngr - X.509 Directory Manager
-------------------------------------
- Version 0.9.x
+ Version 1.0.0
Intro
@@ -23,7 +23,7 @@
Please read the file INSTALL. Here is a quick summary:
1) Unpack the tarball. With GNU tar you can do it this way:
- "tar xzvf dirmngr-x.y.z.tar.gz"
+ "tar xjvf dirmngr-x.y.z.tar.bz2"
2) "cd dirmngr-x.y.z"
@@ -40,9 +40,11 @@
/usr/local/bin. Some other files are also installed for
internal use.
- If you are using dirmngr as part of gnupg 1.9 you are done now.
+ If you are using dirmngr as part of gnupg 2.0 you are done now.
If you want to install it as a system daemon, please see the
manual by running the command "info dirmngr"
+
+
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/TODO 2006-11-29 13:47:15 UTC (rev 242)
@@ -29,5 +29,5 @@
Needs more investigation.
* Test OCSP responder redirection.
- We need to figure out an OCSP responder actually using rediection.
+ We need to figure out an OCSP responder actually using redirection.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/configure.ac 2006-11-29 13:47:15 UTC (rev 242)
@@ -23,8 +23,17 @@
AC_PREREQ(2.59)
min_automake_version="1.9.3"
-AC_INIT(dirmngr, 0.9.7, gpa-dev at gnupg.org)
+# Remember to change the version number immediately *after* a release.
+# Set my_issvn to "yes" for non-released code. Remember to run an
+# "svn up" and "autogen.sh" right before creating a distribution.
+m4_define([my_version], [1.0.0])
+m4_define([my_issvn], [yes])
+m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
+ || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
+AC_INIT([dirmngr], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
+ [bug-dirmngr at gnupg.org])
+
NEED_GPG_ERROR_VERSION=1.4
NEED_LIBGCRYPT_API=1
@@ -36,9 +45,12 @@
NEED_KSBA_API=1
NEED_KSBA_VERSION=1.0.0
+COPYRIGHT_YEAR_NAME="2006 g10 Code GmbH"
+
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
+
AC_CONFIG_SRCDIR(src/dirmngr.c)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -62,6 +74,8 @@
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
[Bug report address])
+AC_DEFINE_UNQUOTED(COPYRIGHT_YEAR_NAME, "$COPYRIGHT_YEAR_NAME",
+ [Used by --version])
AC_DEFINE_UNQUOTED(NEED_LIBGCRYPT_VERSION, "$NEED_LIBGCRYPT_VERSION",
[Required version of Libgcrypt])
AC_DEFINE_UNQUOTED(NEED_KSBA_VERSION, "$NEED_KSBA_VERSION",
@@ -151,7 +165,7 @@
AM_GNU_GETTEXT_VERSION([0.15])
-AM_GNU_GETTEXT(,[need-ngettext])
+AM_GNU_GETTEXT([external],[need-ngettext])
#
# Checks for libraries.
@@ -366,6 +380,7 @@
*** This library is for example available at
*** ftp://ftp.gnupg.org/pub/gcrypt/libassuan/
*** (at least version $NEED_LIBASSUAN_VERSION is required).
+*** Note, that libassuan must have been build with Pth support.
***]])
fi
if test "$have_ksba" = "no"; then
@@ -409,7 +424,7 @@
-AC_CONFIG_FILES([ po/Makefile.in intl/Makefile
+AC_CONFIG_FILES([ po/Makefile.in
Makefile
m4/Makefile
jnlib/Makefile
Modified: trunk/jnlib/ChangeLog
===================================================================
--- trunk/jnlib/ChangeLog 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/jnlib/ChangeLog 2006-11-29 13:47:15 UTC (rev 242)
@@ -1,3 +1,14 @@
+2006-11-29 Werner Koch <wk at g10code.com>
+
+ * argparse.c (strusage): Define 49 as error reporting address.
+ (show_help): Include error reporting address is not empty.
+
+ * libjnlib-config.h: Do not require utf8 conversion.
+ * Makefile.am (libjnlib_a_SOURCES): Do not build utf8conv.
+ * stringhelp.c (print_sanitized_utf8_buffer)
+ (print_sanitized_utf8_string): Build only if utf8 support has been
+ requested.
+
2006-11-16 Werner Koch <wk at g10code.com>
Updated to current jnlib version of GnuPG SVN revision 4334.
Modified: trunk/jnlib/Makefile.am
===================================================================
--- trunk/jnlib/Makefile.am 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/jnlib/Makefile.am 2006-11-29 13:47:15 UTC (rev 242)
@@ -33,12 +33,12 @@
libjnlib-config.h \
stringhelp.c stringhelp.h \
strlist.c strlist.h \
- utf8conv.c utf8conv.h \
argparse.c argparse.h \
logging.c logging.h \
dotlock.c dotlock.h \
types.h mischelp.h
+# utf8conv.c utf8conv.h \
# w32-pth.c w32-pth.h \
# w32-afunix.c w32-afunix.h
# xmalloc.c xmalloc.h
Modified: trunk/jnlib/argparse.c
===================================================================
--- trunk/jnlib/argparse.c 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/jnlib/argparse.c 2006-11-29 13:47:15 UTC (rev 242)
@@ -820,8 +820,20 @@
puts("\n(A single dash may be used instead of the double ones)");
}
if( (s=strusage(19)) ) { /* bug reports to ... */
+ /* To allow changing the bug reporting address without
+ * touching an i18n string, we replace a placeholder @EMAIL@
+ * while printing by a string given with strusage(49). */
+ const char *email, *point;
putchar('\n');
- fputs(s, stdout);
+ email = strusage (49);
+ if (email && *email && (point = strstr (s, "@EMAIL@")) ) {
+ for (; s < point; s++)
+ putchar (*s);
+ fputs (email, stdout);
+ s = point + 7;
+ }
+ fputs(s, stdout);
+
}
fflush(stdout);
exit(0);
@@ -888,11 +900,13 @@
* 16: Long copying conditions (with LFs)
* 17: Optional printable OS name
* 18: Optional thanks list (with LFs)
- * 19: Bug report info
+ * 19: Bug report info (see also 190).
*20..29: Additional lib version strings.
*30..39: Additional program info (with LFs)
* 40: short usage note (with LF)
* 41: long usage note (with LF)
+ * 49: bug reporting address: If not empty, insert this string
+ * into the string returned by 19 at @EMAIL@
*/
const char *
strusage( int level )
Modified: trunk/jnlib/libjnlib-config.h
===================================================================
--- trunk/jnlib/libjnlib-config.h 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/jnlib/libjnlib-config.h 2006-11-29 13:47:15 UTC (rev 242)
@@ -30,8 +30,8 @@
#include <gcrypt.h> /* gcry_malloc & Cie. */
#include "logging.h"
-/* We require support for utf-8 conversion. */
-#define JNLIB_NEED_UTF8CONV 1
+/* We do not require support for utf-8 conversion. */
+/* #define JNLIB_NEED_UTF8CONV 1*/
#ifdef USE_SIMPLE_GETTEXT
Modified: trunk/jnlib/stringhelp.c
===================================================================
--- trunk/jnlib/stringhelp.c 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/jnlib/stringhelp.c 2006-11-29 13:47:15 UTC (rev 242)
@@ -30,7 +30,9 @@
#endif
#include "libjnlib-config.h"
+#ifdef JNLIB_NEED_UTF8CONV
#include "utf8conv.h"
+#endif
#include "stringhelp.h"
@@ -442,6 +444,7 @@
}
+#ifdef JNLIB_NEED_UTF8CONV
size_t
print_sanitized_utf8_buffer (FILE *fp, const void *buffer,
size_t length, int delim)
@@ -467,8 +470,10 @@
else
return print_sanitized_buffer (fp, p, length, delim);
}
+#endif /*JNLIB_NEED_UTF8CONV*/
+
size_t
print_sanitized_string2 (FILE *fp, const char *string, int delim, int delim2)
{
@@ -482,6 +487,7 @@
return string? print_sanitized_buffer (fp, string, strlen (string), delim):0;
}
+#ifdef JNLIB_NEED_UTF8CONV
size_t
print_sanitized_utf8_string (FILE *fp, const char *string, int delim)
{
@@ -489,6 +495,7 @@
string, strlen (string),
delim) : 0;
}
+#endif /*JNLIB_NEED_UTF8CONV*/
/* Create a string from the buffer P_ARG of length N which is suitable for
printing. Caller must release the created string using xfree. */
Deleted: trunk/jnlib/utf8conv.c
Deleted: trunk/jnlib/utf8conv.h
Modified: trunk/m4/Makefile
===================================================================
--- trunk/m4/Makefile 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/m4/Makefile 2006-11-29 13:47:15 UTC (rev 242)
@@ -39,25 +39,14 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
- $(top_srcdir)/m4/gnupg-pth.m4 $(top_srcdir)/m4/gpg-error.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-h.m4 \
- $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ksba.m4 \
- $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gnupg-pth.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/ksba.m4 $(top_srcdir)/m4/lib-ld.m4 \
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
$(top_srcdir)/m4/libassuan.m4 $(top_srcdir)/m4/libgcrypt.m4 \
- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
- $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -67,7 +56,6 @@
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/wk/w/dirmngr/missing --run aclocal-1.9
-ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
AMTAR = ${SHELL} /home/wk/w/dirmngr/missing --run tar
@@ -75,16 +63,12 @@
AUTOHEADER = ${SHELL} /home/wk/w/dirmngr/missing --run autoheader
AUTOMAKE = ${SHELL} /home/wk/w/dirmngr/missing --run automake-1.9
AWK = gawk
-BUILD_INCLUDED_LIBINTL = no
-CATOBJEXT = .gmo
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wformat-nonliteral -Wno-pointer-sign
-CFLAG_VISIBILITY = -fvisibility=hidden
CPP = gcc -E
CPPFLAGS =
CYGPATH_W = echo
-DATADIRNAME = share
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
ECHO_C =
@@ -92,29 +76,17 @@
ECHO_T =
EGREP = /bin/grep -E
EXEEXT =
-GENCAT = gencat
-GLIBC2 = yes
-GLIBC21 = yes
GMSGFMT = /usr/bin/msgfmt
GMSGFMT_015 = /usr/bin/msgfmt
GPG_ERROR_CFLAGS = -I/usr/local/include
GPG_ERROR_CONFIG = /usr/local/bin/gpg-error-config
GPG_ERROR_LIBS = -L/usr/local/lib -lgpg-error
GREP = /bin/grep
-HAVE_ASPRINTF = 1
-HAVE_POSIX_PRINTF = 1
-HAVE_SNPRINTF = 1
-HAVE_VISIBILITY = 1
-HAVE_WPRINTF = 0
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-INSTOBJEXT = .mo
-INTLBISON = bison
INTLLIBS =
-INTLOBJS =
-INTL_LIBTOOL_SUFFIX_PREFIX =
INTL_MACOSX_LIBS =
KSBA_CFLAGS = -I/usr/local/include
KSBA_CONFIG = /usr/local/bin/ksba-config
@@ -129,20 +101,14 @@
LIBGCRYPT_CFLAGS = -I/usr/local/include -I/usr/local/include
LIBGCRYPT_CONFIG = /usr/local/bin/libgcrypt-config
LIBGCRYPT_LIBS = -L/usr/local/lib -lgcrypt -L/usr/local/lib -lgpg-error
-LIBICONV =
+LIBICONV = -liconv
LIBINTL =
-LIBMULTITHREAD = -lpthread
LIBOBJS = ${LIBOBJDIR}funopen$U.o
-LIBPTH =
LIBS =
-LIBTHREAD =
LN_S = ln -s
-LTLIBICONV =
+LTLIBICONV = -liconv
LTLIBINTL =
-LTLIBMULTITHREAD = -lpthread
LTLIBOBJS = ${LIBOBJDIR}funopen$U.lo
-LTLIBPTH =
-LTLIBTHREAD =
MAINT =
MAINTAINER_MODE_FALSE = #
MAINTAINER_MODE_TRUE =
@@ -152,11 +118,11 @@
MSGMERGE = /usr/bin/msgmerge
OBJEXT = o
PACKAGE = dirmngr
-PACKAGE_BUGREPORT = gpa-dev at gnupg.org
+PACKAGE_BUGREPORT = bug-dirmngr at gnupg.org
PACKAGE_NAME = dirmngr
-PACKAGE_STRING = dirmngr 0.9.7
+PACKAGE_STRING = dirmngr 1.0.0-svn241
PACKAGE_TARNAME = dirmngr
-PACKAGE_VERSION = 0.9.7
+PACKAGE_VERSION = 1.0.0-svn241
PATH_SEPARATOR = :
POSUB = po
PTH_CFLAGS = -I/usr/include
@@ -166,10 +132,8 @@
SET_MAKE =
SHELL = /bin/sh
STRIP =
-USE_INCLUDED_LIBINTL = no
USE_NLS = yes
-VERSION = 0.9.7
-WOE32DLL = no
+VERSION = 1.0.0-svn241
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
ac_ct_CC = gcc
Modified: trunk/m4/Makefile.in
===================================================================
--- trunk/m4/Makefile.in 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/m4/Makefile.in 2006-11-29 13:47:15 UTC (rev 242)
@@ -39,25 +39,14 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
- $(top_srcdir)/m4/gnupg-pth.m4 $(top_srcdir)/m4/gpg-error.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-h.m4 \
- $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ksba.m4 \
- $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gnupg-pth.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/ksba.m4 $(top_srcdir)/m4/lib-ld.m4 \
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
$(top_srcdir)/m4/libassuan.m4 $(top_srcdir)/m4/libgcrypt.m4 \
- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longdouble.m4 \
- $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
- $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -67,7 +56,6 @@
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -75,16 +63,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO_C = @ECHO_C@
@@ -92,29 +76,17 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GENCAT = @GENCAT@
-GLIBC2 = @GLIBC2@
-GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
GREP = @GREP@
-HAVE_ASPRINTF = @HAVE_ASPRINTF@
-HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-HAVE_SNPRINTF = @HAVE_SNPRINTF@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
-HAVE_WPRINTF = @HAVE_WPRINTF@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
KSBA_CFLAGS = @KSBA_CFLAGS@
KSBA_CONFIG = @KSBA_CONFIG@
@@ -131,18 +103,12 @@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
LIBS = @LIBS@
-LIBTHREAD = @LIBTHREAD@
LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
-LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
@@ -166,10 +132,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-WOE32DLL = @WOE32DLL@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
ac_ct_CC = @ac_ct_CC@
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/po/de.po 2006-11-29 13:47:15 UTC (rev 242)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: dirmngr 0.9.2\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2006-11-17 10:59+0100\n"
-"PO-Revision-Date: 2006-11-17 11:02+0100\n"
+"POT-Creation-Date: 2006-11-29 14:06+0100\n"
+"PO-Revision-Date: 2006-11-29 14:07+0100\n"
"Last-Translator: Werner Koch <wk at g10code.com>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
@@ -103,7 +103,7 @@
msgid " runtime cached certificates: %u\n"
msgstr "zur Laufzeit zwischengespeicherte Zertifikate: %u\n"
-#: src/certcache.c:480 src/dirmngr-client.c:366
+#: src/certcache.c:480 src/dirmngr-client.c:365
msgid "certificate already cached\n"
msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
@@ -111,7 +111,7 @@
msgid "certificate cached\n"
msgstr "Zertifikat wurde zwischengespeichert\n"
-#: src/certcache.c:484 src/certcache.c:504 src/dirmngr-client.c:370
+#: src/certcache.c:484 src/certcache.c:504 src/dirmngr-client.c:369
#, c-format
msgid "error caching certificate: %s\n"
msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
@@ -243,7 +243,7 @@
msgid "unsupported record type in `%s' line %u skipped\n"
msgstr "Nicht unterstützter Datensatztyp in `%s', Zeile %u übergangen\n"
-#: src/crlcache.c:593 src/crlcache.c:829 src/dirmngr.c:1234
+#: src/crlcache.c:593 src/crlcache.c:829 src/dirmngr.c:1236
#, c-format
msgid "error reading `%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
@@ -690,7 +690,7 @@
msgid "certificate search not possible due to disabled %s\n"
msgstr "Zertifikatsuche ist nicht möglich da %s abgeschaltet ist\n"
-#: src/dirmngr.c:109
+#: src/dirmngr.c:111
msgid ""
"@Commands:\n"
" "
@@ -698,35 +698,35 @@
"@Kommandos:\n"
" "
-#: src/dirmngr.c:111
+#: src/dirmngr.c:113
msgid "run in server mode (foreground)"
msgstr "Im Servermodus ausführen (Vordergrund)"
-#: src/dirmngr.c:112
+#: src/dirmngr.c:114
msgid "run in daemon mode (background)"
msgstr "Im Daemonmodus ausführen (Hintergrund)"
-#: src/dirmngr.c:113
+#: src/dirmngr.c:115
msgid "list the contents of the CRL cache"
msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
-#: src/dirmngr.c:114
+#: src/dirmngr.c:116
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
-#: src/dirmngr.c:115
+#: src/dirmngr.c:117
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|Hole eine CRL von dieser URL"
-#: src/dirmngr.c:116
+#: src/dirmngr.c:118
msgid "shutdown the dirmngr"
msgstr "Den Dirmngr herunterfahren"
-#: src/dirmngr.c:117
+#: src/dirmngr.c:119
msgid "flush the cache"
msgstr "Den Zwischenspeicher löschen"
-#: src/dirmngr.c:121
+#: src/dirmngr.c:123
msgid ""
"@\n"
"Options:\n"
@@ -736,111 +736,111 @@
"Optionen:\n"
" "
-#: src/dirmngr.c:123 src/dirmngr-client.c:67 src/dirmngr_ldap.c:76
+#: src/dirmngr.c:125 src/dirmngr-client.c:67 src/dirmngr_ldap.c:76
msgid "verbose"
msgstr "ausführlich"
-#: src/dirmngr.c:124 src/dirmngr-client.c:68 src/dirmngr_ldap.c:77
+#: src/dirmngr.c:126 src/dirmngr-client.c:68 src/dirmngr_ldap.c:77
msgid "be somewhat more quiet"
msgstr "etwas weniger Ausgaben erzeugen"
-#: src/dirmngr.c:125
+#: src/dirmngr.c:127
msgid "sh-style command output"
msgstr "Kommandausgabe für /bin/sh"
-#: src/dirmngr.c:126
+#: src/dirmngr.c:128
msgid "csh-style command output"
msgstr "Kommandausgabe für /bin/csh"
-#: src/dirmngr.c:127
+#: src/dirmngr.c:129
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Lese Optionen aus DATEI"
-#: src/dirmngr.c:129
+#: src/dirmngr.c:131
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Setze die Debugebene auf NAME"
-#: src/dirmngr.c:130
+#: src/dirmngr.c:132
msgid "do not detach from the console"
msgstr "Nicht von der Konsole loslösen"
-#: src/dirmngr.c:131
+#: src/dirmngr.c:133
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
-#: src/dirmngr.c:132
+#: src/dirmngr.c:134
msgid "run without asking a user"
msgstr "Ausführung ohne Benutzernachfrage"
-#: src/dirmngr.c:133
+#: src/dirmngr.c:135
msgid "force loading of outdated CRLs"
msgstr "Laden von abgelaufenen CRLs erzwingen"
-#: src/dirmngr.c:134
+#: src/dirmngr.c:136
msgid "allow sending OCSP requests"
msgstr "OCSP Anfragen erlauben"
-#: src/dirmngr.c:135
+#: src/dirmngr.c:137
msgid "inhibit the use of HTTP"
msgstr "Sperre die Benutzung von HTTP"
-#: src/dirmngr.c:136
+#: src/dirmngr.c:138
msgid "inhibit the use of LDAP"
msgstr "Sperre die Benutzung von LDAP"
-#: src/dirmngr.c:138
+#: src/dirmngr.c:140
msgid "ignore HTTP CRL distribution points"
msgstr "Übergehe HTTP CRL Distribution Points"
-#: src/dirmngr.c:140
+#: src/dirmngr.c:142
msgid "ignore LDAP CRL distribution points"
msgstr "Übergehe LDAP CRL Distribution Points"
-#: src/dirmngr.c:142
+#: src/dirmngr.c:144
msgid "ignore certificate contained OCSP service URLs"
msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
-#: src/dirmngr.c:148
+#: src/dirmngr.c:150
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|Leite alle HTTP Anfragen über URL"
-#: src/dirmngr.c:150
+#: src/dirmngr.c:152
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|Benutze HOST für LDAP Anfragen"
-#: src/dirmngr.c:152
+#: src/dirmngr.c:154
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
-#: src/dirmngr.c:155
+#: src/dirmngr.c:157
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
-#: src/dirmngr.c:157
+#: src/dirmngr.c:159
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "Füge neue Server aus den CRL Distribution Points der Serverliste hinzu"
-#: src/dirmngr.c:159 src/dirmngr_ldap.c:78
+#: src/dirmngr.c:161 src/dirmngr_ldap.c:78
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|Setze das LDAP Timeout auf N Sekunden"
-#: src/dirmngr.c:161
+#: src/dirmngr.c:163
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|Benutze den OCSP Reponder mit dieser URL"
-#: src/dirmngr.c:162
+#: src/dirmngr.c:164
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
-#: src/dirmngr.c:167
+#: src/dirmngr.c:169
msgid "|N|do not return more than N items in one query"
msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
-#: src/dirmngr.c:169
+#: src/dirmngr.c:171
msgid "|FILE|listen on socket FILE"
msgstr "|DATEI|Anfragen auf Socket DATEI annehmen"
-#: src/dirmngr.c:182
+#: src/dirmngr.c:184
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@ -850,15 +850,17 @@
"(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
"und Optionen)\n"
-#: src/dirmngr.c:227 src/dirmngr-client.c:143 src/dirmngr_ldap.c:140
-msgid "Please report bugs to <gpa-dev at gnupg.org>.\n"
-msgstr "Berichte über Bugs (Programmfehler) bitte an <gpa-dev at gnupg.org>.\n"
+#. TRANSLATORS: @EMAIL will get replaced by the actual bug
+#. reporting address.
+#: src/dirmngr.c:231 src/dirmngr-client.c:142 src/dirmngr_ldap.c:139
+msgid "Please report bugs to <@EMAIL@>.\n"
+msgstr "Berichte über Bugs (Programmfehler) bitte an <@EMAIL@>.\n"
-#: src/dirmngr.c:231
+#: src/dirmngr.c:234
msgid "Usage: dirmngr [options] (-h for help)"
msgstr "Gebrauch: dirmnr [Optionen] [Kommando [Argumente]]"
-#: src/dirmngr.c:234
+#: src/dirmngr.c:236
msgid ""
"Syntax: dirmngr [options] [command [args]]\n"
"LDAP and OCSP access for GnuPG\n"
@@ -866,180 +868,180 @@
"Syntax: dirmngr [Optionen] [Kommando [Argumente]]\n"
"LDAP und OCSP Zugriff für GnuPG\n"
-#: src/dirmngr.c:305
+#: src/dirmngr.c:307
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "Ungültige Debugebene '%s' angegeben\n"
-#: src/dirmngr.c:306
+#: src/dirmngr.c:308
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "Gültige Debugebenen sind: %s\n"
-#: src/dirmngr.c:344
+#: src/dirmngr.c:346
msgid "usage: dirmngr [options] "
msgstr "Gebrauch: dirmngr [Optionen] "
-#: src/dirmngr.c:369
+#: src/dirmngr.c:371
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
msgstr "Fehler beim Starten des LDAP Wrapper Kontrollthreads: %s\n"
-#: src/dirmngr.c:508 src/dirmngr.c:518
+#: src/dirmngr.c:510 src/dirmngr.c:520
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s ist zu alt (benötige %s, habe %s)\n"
-#: src/dirmngr.c:616
+#: src/dirmngr.c:618
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Voreingestellte Optionendatei `%s' nicht vorhanden\n"
-#: src/dirmngr.c:621 src/dirmngr.c:1291
+#: src/dirmngr.c:623 src/dirmngr.c:1293
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei `%s': %s\n"
-#: src/dirmngr.c:629
+#: src/dirmngr.c:631
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden von `%s' gelesen\n"
-#: src/dirmngr.c:730
+#: src/dirmngr.c:732
#, c-format
msgid "WARNING: running with faked system time %s\n"
msgstr "WARNUNG: Prozess läuft mit getürkter Systemzeit %s\n"
-#: src/dirmngr.c:807
+#: src/dirmngr.c:809
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
-#: src/dirmngr.c:812
+#: src/dirmngr.c:814
msgid "name of socket too long\n"
msgstr "Name des Sockets ist zu lang\n"
-#: src/dirmngr.c:819
+#: src/dirmngr.c:821
#, c-format
msgid "can't create socket: %s\n"
msgstr "Fehler beim Erzeugen des Sockets: %s\n"
-#: src/dirmngr.c:838
+#: src/dirmngr.c:840
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "Fehler beim Binden des Sockets an `%s': %s\n"
-#: src/dirmngr.c:847
+#: src/dirmngr.c:849
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() fehlgeschlagen: %s\n"
-#: src/dirmngr.c:853
+#: src/dirmngr.c:855
#, c-format
msgid "listening on socket `%s'\n"
msgstr "Anfragen werden auf Socket `%s' engegengenommen\n"
-#: src/dirmngr.c:859
+#: src/dirmngr.c:861
#, c-format
msgid "fork failed: %s\n"
msgstr "fork() fehlgeschlagen: %s\n"
-#: src/dirmngr.c:877
+#: src/dirmngr.c:879
msgid "out of core\n"
msgstr "Nicht genügend Hauptspeicher vorhanden\n"
-#: src/dirmngr.c:916
+#: src/dirmngr.c:918
#, c-format
msgid "setsid() failed: %s\n"
msgstr "setsid() fehlgeschlagen: %s\n"
-#: src/dirmngr.c:926
+#: src/dirmngr.c:928
#, c-format
msgid "chdir to / failed: %s\n"
msgstr "chdir nach / fehlgeschlagen: %s\n"
-#: src/dirmngr.c:981
+#: src/dirmngr.c:983
#, c-format
msgid "fetching CRL from `%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
-#: src/dirmngr.c:987
+#: src/dirmngr.c:989
#, c-format
msgid "processing CRL from `%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
-#: src/dirmngr.c:1138
+#: src/dirmngr.c:1140
#, c-format
msgid "error opening `%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
-#: src/dirmngr.c:1155
+#: src/dirmngr.c:1157
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
-#: src/dirmngr.c:1183
+#: src/dirmngr.c:1185
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: Kein Hostname angegeben\n"
-#: src/dirmngr.c:1202
+#: src/dirmngr.c:1204
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: Passwort angegeben ohne Username\n"
-#: src/dirmngr.c:1223
+#: src/dirmngr.c:1225
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: Diese Zeile wird übersprungen\n"
-#: src/dirmngr.c:1323
+#: src/dirmngr.c:1325
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
"SIGHUP empfangen - lese die Konfiguration erneut und lösche die "
"Zwischenspeicher\n"
-#: src/dirmngr.c:1337
+#: src/dirmngr.c:1339
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
-#: src/dirmngr.c:1342
+#: src/dirmngr.c:1344
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
-#: src/dirmngr.c:1344
+#: src/dirmngr.c:1346
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
-#: src/dirmngr.c:1349
+#: src/dirmngr.c:1351
msgid "shutdown forced\n"
msgstr "Herunterfahren wurde erzwungen\n"
-#: src/dirmngr.c:1357
+#: src/dirmngr.c:1359
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
-#: src/dirmngr.c:1364
+#: src/dirmngr.c:1366
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "Signal %d empfangen - keine Aktion definiert\n"
-#: src/dirmngr.c:1378
+#: src/dirmngr.c:1380
#, c-format
msgid "handler for fd %d started\n"
msgstr "Routine für fd %d gestartet\n"
-#: src/dirmngr.c:1383
+#: src/dirmngr.c:1385
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Routine für fd %d beendet\n"
-#: src/dirmngr.c:1439
+#: src/dirmngr.c:1441
#, c-format
msgid "accept failed: %s - waiting 1s\n"
msgstr "accept() fehlgeschlagen: %s - warte 1s\n"
-#: src/dirmngr.c:1446
+#: src/dirmngr.c:1448
#, c-format
msgid "error spawning connection handler: %s\n"
msgstr "Fehler beim Starten des Verbindungshandler: %s\n"
@@ -1583,12 +1585,12 @@
msgid "certificates are expected in PEM format"
msgstr "Zertifikate werden im PEM Format erwartet"
-#: src/dirmngr-client.c:147
+#: src/dirmngr-client.c:146
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"Gebrauch: dirmngr-client [Optionen] [Zertdatei|Muster] (-h für Hilfe)\n"
-#: src/dirmngr-client.c:151
+#: src/dirmngr-client.c:150
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -1601,98 +1603,98 @@
"The Prozess gibt 0 zurück wenn das Zertifikat gültig ist, 1 wenn es nicht\n"
"gültig ist und weitere Werte bei anderen Fehlern.\n"
-#: src/dirmngr-client.c:266 src/dirmngr-client.c:970
+#: src/dirmngr-client.c:265 src/dirmngr-client.c:969
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "Fehler beim Lesen des Zertifikats von der Standardeingabe: %s\n"
-#: src/dirmngr-client.c:273
+#: src/dirmngr-client.c:272
#, c-format
msgid "error reading certificate from `%s': %s\n"
msgstr "Fehler beim Lesen des Zertifikats von `%s': %s\n"
-#: src/dirmngr-client.c:287
+#: src/dirmngr-client.c:286
msgid "certificate too large to make any sense\n"
msgstr "Zertifikat ist zu groß um Sinnvoll zu sein\n"
-#: src/dirmngr-client.c:313
+#: src/dirmngr-client.c:312
#, c-format
msgid "lookup failed: %s\n"
msgstr "Aufsuchen fehlgeschlagen: %s\n"
-#: src/dirmngr-client.c:328
+#: src/dirmngr-client.c:327
#, c-format
msgid "loading CRL `%s' failed: %s\n"
msgstr "Laden der CRL von `%s' fehlgeschlagen: %s\n"
-#: src/dirmngr-client.c:356
+#: src/dirmngr-client.c:355
msgid "a dirmngr daemon is up and running\n"
msgstr "Ein dirmngr ist vorhanden und aktiv\n"
-#: src/dirmngr-client.c:378
+#: src/dirmngr-client.c:377
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "Prüfung des Zertifikats fehlgeschlagen: %s\n"
-#: src/dirmngr-client.c:385 src/dirmngr-client.c:981
+#: src/dirmngr-client.c:384 src/dirmngr-client.c:980
msgid "certificate is valid\n"
msgstr "Zertifikat ist gültig\n"
-#: src/dirmngr-client.c:391 src/dirmngr-client.c:989
+#: src/dirmngr-client.c:390 src/dirmngr-client.c:988
msgid "certificate has been revoked\n"
msgstr "Zertifikat wurde widerrufen\n"
-#: src/dirmngr-client.c:396 src/dirmngr-client.c:991
+#: src/dirmngr-client.c:395 src/dirmngr-client.c:990
#, c-format
msgid "certificate check failed: %s\n"
msgstr "Zertifikatprüfung fehlgeschlagen: %s\n"
-#: src/dirmngr-client.c:407
+#: src/dirmngr-client.c:406
#, c-format
msgid "got status: `%s'\n"
msgstr "Erhielt Status: `%s'\n"
-#: src/dirmngr-client.c:422
+#: src/dirmngr-client.c:421
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "Fehler beim Schreiben der Base-64 Darstellung: %s\n"
-#: src/dirmngr-client.c:454
+#: src/dirmngr-client.c:453
msgid "apparently no running dirmngr\n"
msgstr "Offensichtlich ist kein Dirmngr vorhanden\n"
-#: src/dirmngr-client.c:459
+#: src/dirmngr-client.c:458
msgid "no running dirmngr - starting one\n"
msgstr "Dirmngr läuft nicht - ein neuer wird gestartet\n"
-#: src/dirmngr-client.c:492
+#: src/dirmngr-client.c:491
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "Fehlerhafte DIRMNGR_INFO Variable\n"
-#: src/dirmngr-client.c:507
+#: src/dirmngr-client.c:506
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "Dirmngr Protocol Version %d wird nicht unterstützt\n"
-#: src/dirmngr-client.c:523
+#: src/dirmngr-client.c:522
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "Verbindung zum Dirmngr nicht möglich - Rückfallmethode wird versucht\n"
-#: src/dirmngr-client.c:531
+#: src/dirmngr-client.c:530
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr "Verbindung zum Dirmngr nicht möglich: %s\n"
-#: src/dirmngr-client.c:780
+#: src/dirmngr-client.c:779
#, c-format
msgid "unsupported inquiry `%s'\n"
msgstr "Nicht unterstützte INQUIRY `%s'\n"
-#: src/dirmngr-client.c:876
+#: src/dirmngr-client.c:875
msgid "absolute file name expected\n"
msgstr "Absoluter Dateiname erwartet\n"
-#: src/dirmngr-client.c:918
+#: src/dirmngr-client.c:917
#, c-format
msgid "looking up `%s'\n"
msgstr "Auffinden von `%s'\n"
@@ -1742,11 +1744,11 @@
msgid "|STRING|return the attribute STRING"
msgstr "|STRING|Gib das Attribut STRING zurück"
-#: src/dirmngr_ldap.c:144
+#: src/dirmngr_ldap.c:143
msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
msgstr "Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
-#: src/dirmngr_ldap.c:147
+#: src/dirmngr_ldap.c:146
msgid ""
"Syntax: dirmngr_ldap [options] [URL]\n"
"Internal LDAP helper for Dirmngr.\n"
@@ -1756,116 +1758,119 @@
"Internes LDAP-Hilfsprogramm für Dirmngr.\n"
"Interface und Optionen können sich mit jedem Release ändern.\n"
-#: src/dirmngr_ldap.c:249
+#: src/dirmngr_ldap.c:248
#, c-format
msgid "invalid port number %d\n"
msgstr "Ungültige Portnummer %d\n"
-#: src/dirmngr_ldap.c:310
+#: src/dirmngr_ldap.c:309
#, c-format
msgid "scanning result for attribute `%s'\n"
msgstr "Absuchen des Ergebnisses nach Attribut `%s'\n"
-#: src/dirmngr_ldap.c:317 src/dirmngr_ldap.c:379 src/dirmngr_ldap.c:403
-#: src/dirmngr_ldap.c:414 src/dirmngr_ldap.c:526
+#: src/dirmngr_ldap.c:316 src/dirmngr_ldap.c:378 src/dirmngr_ldap.c:402
+#: src/dirmngr_ldap.c:413 src/dirmngr_ldap.c:525
#, c-format
msgid "error writing to stdout: %s\n"
msgstr "Fehler beim Schreiben auf Standardausgabe: %s\n"
-#: src/dirmngr_ldap.c:331
+#: src/dirmngr_ldap.c:330
#, c-format
msgid " available attribute `%s'\n"
msgstr " verfügbare Attribute `%s'\n"
-#: src/dirmngr_ldap.c:358
+#: src/dirmngr_ldap.c:357
#, c-format
msgid "attribute `%s' not found\n"
msgstr "Attribut `%s' nicht gefunden\n"
-#: src/dirmngr_ldap.c:364
+#: src/dirmngr_ldap.c:363
#, c-format
msgid "found attribute `%s'\n"
msgstr "Attribut `%s' gefunden\n"
-#: src/dirmngr_ldap.c:461
+#: src/dirmngr_ldap.c:460
#, c-format
msgid "processing url `%s'\n"
msgstr "Verarbeiten der URL `%s'\n"
-#: src/dirmngr_ldap.c:463
+#: src/dirmngr_ldap.c:462
#, c-format
msgid " user `%s'\n"
msgstr " Benutzer `%s'\n"
-#: src/dirmngr_ldap.c:465
+#: src/dirmngr_ldap.c:464
#, c-format
msgid " pass `%s'\n"
msgstr " Passwort `%s'\n"
-#: src/dirmngr_ldap.c:467
+#: src/dirmngr_ldap.c:466
#, c-format
msgid " host `%s'\n"
msgstr " Host `%s'\n"
-#: src/dirmngr_ldap.c:468
+#: src/dirmngr_ldap.c:467
#, c-format
msgid " port %d\n"
msgstr " Port %d\n"
-#: src/dirmngr_ldap.c:470
+#: src/dirmngr_ldap.c:469
#, c-format
msgid " DN `%s'\n"
msgstr " DN `%s'\n"
-#: src/dirmngr_ldap.c:472
+#: src/dirmngr_ldap.c:471
#, c-format
msgid " filter `%s'\n"
msgstr " Filter `%s'\n"
-#: src/dirmngr_ldap.c:477 src/dirmngr_ldap.c:480
+#: src/dirmngr_ldap.c:476 src/dirmngr_ldap.c:479
#, c-format
msgid " attr `%s'\n"
msgstr " Attribut `%s'\n"
-#: src/dirmngr_ldap.c:486
+#: src/dirmngr_ldap.c:485
#, c-format
msgid "no host name in `%s'\n"
msgstr "Kein Hostname in `%s'\n"
-#: src/dirmngr_ldap.c:491
+#: src/dirmngr_ldap.c:490
#, c-format
msgid "no attribute given for query `%s'\n"
msgstr "Kein Attribut für Abfrage `%s' angegeben\n"
-#: src/dirmngr_ldap.c:497
+#: src/dirmngr_ldap.c:496
msgid "WARNING: using first attribute only\n"
msgstr "WARNUNG: Es wird nur das erste Attribut benutzt\n"
-#: src/dirmngr_ldap.c:504
+#: src/dirmngr_ldap.c:503
#, c-format
msgid "LDAP init to `%s:%d' failed: %s\n"
msgstr "LDAP Initialisierung von `%s:%d' fehlgeschlagen: %s\n"
-#: src/dirmngr_ldap.c:510
+#: src/dirmngr_ldap.c:509
#, c-format
msgid "binding to `%s:%d' failed: %s\n"
msgstr "Anbindung an `%s:%d' fehlgeschlagen: %s\n"
-#: src/dirmngr_ldap.c:533
+#: src/dirmngr_ldap.c:532
#, c-format
msgid "searching `%s' failed: %s\n"
msgstr "Suche mit `%s' fehlgeschlagen: %s\n"
-#: src/dirmngr_ldap.c:564
+#: src/dirmngr_ldap.c:563
#, c-format
msgid "`%s' is not an LDAP URL\n"
msgstr "`%s' ist kein LDAP URL\n"
-#: src/dirmngr_ldap.c:570
+#: src/dirmngr_ldap.c:569
#, c-format
msgid "`%s' is an invalid LDAP URL\n"
msgstr "`%s' ist ein ungültiger LDAP URL\n"
+#~ msgid "Please report bugs to <gpa-dev at gnupg.org>.\n"
+#~ msgstr "Berichte über Bugs (Programmfehler) bitte an <gpa-dev at gnupg.org>.\n"
+
#~ msgid "invalid HTTP proxy (%s): %s\n"
#~ msgstr "Ungültiger HTTP Proxy (%s): %s\n"
@@ -1887,9 +1892,6 @@
#~ msgid "failed to find issuer certificate: %s\n"
#~ msgstr "Herausgeberzertifikat nicht gefunden: %s\n"
-#~ msgid "Please report bugs to "
-#~ msgstr "Berichte über Bugs (Programmfehler) bitte an "
-
#~ msgid "no issuer found in certificate"
#~ msgstr "Im Zertifikat ist kein Herausgeber enthalten"
Modified: trunk/po/dirmngr.pot
===================================================================
--- trunk/po/dirmngr.pot 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/po/dirmngr.pot 2006-11-29 13:47:15 UTC (rev 242)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2006-11-17 10:59+0100\n"
+"POT-Creation-Date: 2006-11-29 14:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -100,7 +100,7 @@
msgid " runtime cached certificates: %u\n"
msgstr ""
-#: src/certcache.c:480 src/dirmngr-client.c:366
+#: src/certcache.c:480 src/dirmngr-client.c:365
msgid "certificate already cached\n"
msgstr ""
@@ -108,7 +108,7 @@
msgid "certificate cached\n"
msgstr ""
-#: src/certcache.c:484 src/certcache.c:504 src/dirmngr-client.c:370
+#: src/certcache.c:484 src/certcache.c:504 src/dirmngr-client.c:369
#, c-format
msgid "error caching certificate: %s\n"
msgstr ""
@@ -235,7 +235,7 @@
msgid "unsupported record type in `%s' line %u skipped\n"
msgstr ""
-#: src/crlcache.c:593 src/crlcache.c:829 src/dirmngr.c:1234
+#: src/crlcache.c:593 src/crlcache.c:829 src/dirmngr.c:1236
#, c-format
msgid "error reading `%s': %s\n"
msgstr ""
@@ -654,344 +654,346 @@
msgid "certificate search not possible due to disabled %s\n"
msgstr ""
-#: src/dirmngr.c:109
+#: src/dirmngr.c:111
msgid ""
"@Commands:\n"
" "
msgstr ""
-#: src/dirmngr.c:111
+#: src/dirmngr.c:113
msgid "run in server mode (foreground)"
msgstr ""
-#: src/dirmngr.c:112
+#: src/dirmngr.c:114
msgid "run in daemon mode (background)"
msgstr ""
-#: src/dirmngr.c:113
+#: src/dirmngr.c:115
msgid "list the contents of the CRL cache"
msgstr ""
-#: src/dirmngr.c:114
+#: src/dirmngr.c:116
msgid "|FILE|load CRL from FILE into cache"
msgstr ""
-#: src/dirmngr.c:115
+#: src/dirmngr.c:117
msgid "|URL|fetch a CRL from URL"
msgstr ""
-#: src/dirmngr.c:116
+#: src/dirmngr.c:118
msgid "shutdown the dirmngr"
msgstr ""
-#: src/dirmngr.c:117
+#: src/dirmngr.c:119
msgid "flush the cache"
msgstr ""
-#: src/dirmngr.c:121
+#: src/dirmngr.c:123
msgid ""
"@\n"
"Options:\n"
" "
msgstr ""
-#: src/dirmngr.c:123 src/dirmngr-client.c:67 src/dirmngr_ldap.c:76
+#: src/dirmngr.c:125 src/dirmngr-client.c:67 src/dirmngr_ldap.c:76
msgid "verbose"
msgstr ""
-#: src/dirmngr.c:124 src/dirmngr-client.c:68 src/dirmngr_ldap.c:77
+#: src/dirmngr.c:126 src/dirmngr-client.c:68 src/dirmngr_ldap.c:77
msgid "be somewhat more quiet"
msgstr ""
-#: src/dirmngr.c:125
+#: src/dirmngr.c:127
msgid "sh-style command output"
msgstr ""
-#: src/dirmngr.c:126
+#: src/dirmngr.c:128
msgid "csh-style command output"
msgstr ""
-#: src/dirmngr.c:127
+#: src/dirmngr.c:129
msgid "|FILE|read options from FILE"
msgstr ""
-#: src/dirmngr.c:129
+#: src/dirmngr.c:131
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: src/dirmngr.c:130
+#: src/dirmngr.c:132
msgid "do not detach from the console"
msgstr ""
-#: src/dirmngr.c:131
+#: src/dirmngr.c:133
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: src/dirmngr.c:132
+#: src/dirmngr.c:134
msgid "run without asking a user"
msgstr ""
-#: src/dirmngr.c:133
+#: src/dirmngr.c:135
msgid "force loading of outdated CRLs"
msgstr ""
-#: src/dirmngr.c:134
+#: src/dirmngr.c:136
msgid "allow sending OCSP requests"
msgstr ""
-#: src/dirmngr.c:135
+#: src/dirmngr.c:137
msgid "inhibit the use of HTTP"
msgstr ""
-#: src/dirmngr.c:136
+#: src/dirmngr.c:138
msgid "inhibit the use of LDAP"
msgstr ""
-#: src/dirmngr.c:138
+#: src/dirmngr.c:140
msgid "ignore HTTP CRL distribution points"
msgstr ""
-#: src/dirmngr.c:140
+#: src/dirmngr.c:142
msgid "ignore LDAP CRL distribution points"
msgstr ""
-#: src/dirmngr.c:142
+#: src/dirmngr.c:144
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
-#: src/dirmngr.c:148
+#: src/dirmngr.c:150
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
-#: src/dirmngr.c:150
+#: src/dirmngr.c:152
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
-#: src/dirmngr.c:152
+#: src/dirmngr.c:154
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
-#: src/dirmngr.c:155
+#: src/dirmngr.c:157
msgid "|FILE|read LDAP server list from FILE"
msgstr ""
-#: src/dirmngr.c:157
+#: src/dirmngr.c:159
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
-#: src/dirmngr.c:159 src/dirmngr_ldap.c:78
+#: src/dirmngr.c:161 src/dirmngr_ldap.c:78
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
-#: src/dirmngr.c:161
+#: src/dirmngr.c:163
msgid "|URL|use OCSP responder at URL"
msgstr ""
-#: src/dirmngr.c:162
+#: src/dirmngr.c:164
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
-#: src/dirmngr.c:167
+#: src/dirmngr.c:169
msgid "|N|do not return more than N items in one query"
msgstr ""
-#: src/dirmngr.c:169
+#: src/dirmngr.c:171
msgid "|FILE|listen on socket FILE"
msgstr ""
-#: src/dirmngr.c:182
+#: src/dirmngr.c:184
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
"options)\n"
msgstr ""
-#: src/dirmngr.c:227 src/dirmngr-client.c:143 src/dirmngr_ldap.c:140
-msgid "Please report bugs to <gpa-dev at gnupg.org>.\n"
+#. TRANSLATORS: @EMAIL will get replaced by the actual bug
+#. reporting address.
+#: src/dirmngr.c:231 src/dirmngr-client.c:142 src/dirmngr_ldap.c:139
+msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
-#: src/dirmngr.c:231
+#: src/dirmngr.c:234
msgid "Usage: dirmngr [options] (-h for help)"
msgstr ""
-#: src/dirmngr.c:234
+#: src/dirmngr.c:236
msgid ""
"Syntax: dirmngr [options] [command [args]]\n"
"LDAP and OCSP access for GnuPG\n"
msgstr ""
-#: src/dirmngr.c:305
+#: src/dirmngr.c:307
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: src/dirmngr.c:306
+#: src/dirmngr.c:308
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
-#: src/dirmngr.c:344
+#: src/dirmngr.c:346
msgid "usage: dirmngr [options] "
msgstr ""
-#: src/dirmngr.c:369
+#: src/dirmngr.c:371
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
msgstr ""
-#: src/dirmngr.c:508 src/dirmngr.c:518
+#: src/dirmngr.c:510 src/dirmngr.c:520
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: src/dirmngr.c:616
+#: src/dirmngr.c:618
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: src/dirmngr.c:621 src/dirmngr.c:1291
+#: src/dirmngr.c:623 src/dirmngr.c:1293
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:629
+#: src/dirmngr.c:631
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: src/dirmngr.c:730
+#: src/dirmngr.c:732
#, c-format
msgid "WARNING: running with faked system time %s\n"
msgstr ""
-#: src/dirmngr.c:807
+#: src/dirmngr.c:809
msgid "colons are not allowed in the socket name\n"
msgstr ""
-#: src/dirmngr.c:812
+#: src/dirmngr.c:814
msgid "name of socket too long\n"
msgstr ""
-#: src/dirmngr.c:819
+#: src/dirmngr.c:821
#, c-format
msgid "can't create socket: %s\n"
msgstr ""
-#: src/dirmngr.c:838
+#: src/dirmngr.c:840
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:847
+#: src/dirmngr.c:849
#, c-format
msgid "listen() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:853
+#: src/dirmngr.c:855
#, c-format
msgid "listening on socket `%s'\n"
msgstr ""
-#: src/dirmngr.c:859
+#: src/dirmngr.c:861
#, c-format
msgid "fork failed: %s\n"
msgstr ""
-#: src/dirmngr.c:877
+#: src/dirmngr.c:879
msgid "out of core\n"
msgstr ""
-#: src/dirmngr.c:916
+#: src/dirmngr.c:918
#, c-format
msgid "setsid() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:926
+#: src/dirmngr.c:928
#, c-format
msgid "chdir to / failed: %s\n"
msgstr ""
-#: src/dirmngr.c:981
+#: src/dirmngr.c:983
#, c-format
msgid "fetching CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:987
+#: src/dirmngr.c:989
#, c-format
msgid "processing CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1138
+#: src/dirmngr.c:1140
#, c-format
msgid "error opening `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:1155
+#: src/dirmngr.c:1157
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr ""
-#: src/dirmngr.c:1183
+#: src/dirmngr.c:1185
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: src/dirmngr.c:1202
+#: src/dirmngr.c:1204
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: src/dirmngr.c:1223
+#: src/dirmngr.c:1225
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr ""
-#: src/dirmngr.c:1323
+#: src/dirmngr.c:1325
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
-#: src/dirmngr.c:1337
+#: src/dirmngr.c:1339
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1342
+#: src/dirmngr.c:1344
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
-#: src/dirmngr.c:1344
+#: src/dirmngr.c:1346
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
-#: src/dirmngr.c:1349
+#: src/dirmngr.c:1351
msgid "shutdown forced\n"
msgstr ""
-#: src/dirmngr.c:1357
+#: src/dirmngr.c:1359
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
-#: src/dirmngr.c:1364
+#: src/dirmngr.c:1366
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1378
+#: src/dirmngr.c:1380
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: src/dirmngr.c:1383
+#: src/dirmngr.c:1385
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: src/dirmngr.c:1439
+#: src/dirmngr.c:1441
#, c-format
msgid "accept failed: %s - waiting 1s\n"
msgstr ""
-#: src/dirmngr.c:1446
+#: src/dirmngr.c:1448
#, c-format
msgid "error spawning connection handler: %s\n"
msgstr ""
@@ -1526,11 +1528,11 @@
msgid "certificates are expected in PEM format"
msgstr ""
-#: src/dirmngr-client.c:147
+#: src/dirmngr-client.c:146
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
-#: src/dirmngr-client.c:151
+#: src/dirmngr-client.c:150
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@ -1538,98 +1540,98 @@
"not valid and other error codes for general failures\n"
msgstr ""
-#: src/dirmngr-client.c:266 src/dirmngr-client.c:970
+#: src/dirmngr-client.c:265 src/dirmngr-client.c:969
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr ""
-#: src/dirmngr-client.c:273
+#: src/dirmngr-client.c:272
#, c-format
msgid "error reading certificate from `%s': %s\n"
msgstr ""
-#: src/dirmngr-client.c:287
+#: src/dirmngr-client.c:286
msgid "certificate too large to make any sense\n"
msgstr ""
-#: src/dirmngr-client.c:313
+#: src/dirmngr-client.c:312
#, c-format
msgid "lookup failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:328
+#: src/dirmngr-client.c:327
#, c-format
msgid "loading CRL `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:356
+#: src/dirmngr-client.c:355
msgid "a dirmngr daemon is up and running\n"
msgstr ""
-#: src/dirmngr-client.c:378
+#: src/dirmngr-client.c:377
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:385 src/dirmngr-client.c:981
+#: src/dirmngr-client.c:384 src/dirmngr-client.c:980
msgid "certificate is valid\n"
msgstr ""
-#: src/dirmngr-client.c:391 src/dirmngr-client.c:989
+#: src/dirmngr-client.c:390 src/dirmngr-client.c:988
msgid "certificate has been revoked\n"
msgstr ""
-#: src/dirmngr-client.c:396 src/dirmngr-client.c:991
+#: src/dirmngr-client.c:395 src/dirmngr-client.c:990
#, c-format
msgid "certificate check failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:407
+#: src/dirmngr-client.c:406
#, c-format
msgid "got status: `%s'\n"
msgstr ""
-#: src/dirmngr-client.c:422
+#: src/dirmngr-client.c:421
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr ""
-#: src/dirmngr-client.c:454
+#: src/dirmngr-client.c:453
msgid "apparently no running dirmngr\n"
msgstr ""
-#: src/dirmngr-client.c:459
+#: src/dirmngr-client.c:458
msgid "no running dirmngr - starting one\n"
msgstr ""
-#: src/dirmngr-client.c:492
+#: src/dirmngr-client.c:491
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr ""
-#: src/dirmngr-client.c:507
+#: src/dirmngr-client.c:506
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr ""
-#: src/dirmngr-client.c:523
+#: src/dirmngr-client.c:522
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: src/dirmngr-client.c:531
+#: src/dirmngr-client.c:530
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr ""
-#: src/dirmngr-client.c:780
+#: src/dirmngr-client.c:779
#, c-format
msgid "unsupported inquiry `%s'\n"
msgstr ""
-#: src/dirmngr-client.c:876
+#: src/dirmngr-client.c:875
msgid "absolute file name expected\n"
msgstr ""
-#: src/dirmngr-client.c:918
+#: src/dirmngr-client.c:917
#, c-format
msgid "looking up `%s'\n"
msgstr ""
@@ -1679,123 +1681,123 @@
msgid "|STRING|return the attribute STRING"
msgstr ""
-#: src/dirmngr_ldap.c:144
+#: src/dirmngr_ldap.c:143
msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
msgstr ""
-#: src/dirmngr_ldap.c:147
+#: src/dirmngr_ldap.c:146
msgid ""
"Syntax: dirmngr_ldap [options] [URL]\n"
"Internal LDAP helper for Dirmngr.\n"
"Interface and options may change without notice.\n"
msgstr ""
-#: src/dirmngr_ldap.c:249
+#: src/dirmngr_ldap.c:248
#, c-format
msgid "invalid port number %d\n"
msgstr ""
-#: src/dirmngr_ldap.c:310
+#: src/dirmngr_ldap.c:309
#, c-format
msgid "scanning result for attribute `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:317 src/dirmngr_ldap.c:379 src/dirmngr_ldap.c:403
-#: src/dirmngr_ldap.c:414 src/dirmngr_ldap.c:526
+#: src/dirmngr_ldap.c:316 src/dirmngr_ldap.c:378 src/dirmngr_ldap.c:402
+#: src/dirmngr_ldap.c:413 src/dirmngr_ldap.c:525
#, c-format
msgid "error writing to stdout: %s\n"
msgstr ""
-#: src/dirmngr_ldap.c:331
+#: src/dirmngr_ldap.c:330
#, c-format
msgid " available attribute `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:358
+#: src/dirmngr_ldap.c:357
#, c-format
msgid "attribute `%s' not found\n"
msgstr ""
-#: src/dirmngr_ldap.c:364
+#: src/dirmngr_ldap.c:363
#, c-format
msgid "found attribute `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:461
+#: src/dirmngr_ldap.c:460
#, c-format
msgid "processing url `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:463
+#: src/dirmngr_ldap.c:462
#, c-format
msgid " user `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:465
+#: src/dirmngr_ldap.c:464
#, c-format
msgid " pass `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:467
+#: src/dirmngr_ldap.c:466
#, c-format
msgid " host `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:468
+#: src/dirmngr_ldap.c:467
#, c-format
msgid " port %d\n"
msgstr ""
-#: src/dirmngr_ldap.c:470
+#: src/dirmngr_ldap.c:469
#, c-format
msgid " DN `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:472
+#: src/dirmngr_ldap.c:471
#, c-format
msgid " filter `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:477 src/dirmngr_ldap.c:480
+#: src/dirmngr_ldap.c:476 src/dirmngr_ldap.c:479
#, c-format
msgid " attr `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:486
+#: src/dirmngr_ldap.c:485
#, c-format
msgid "no host name in `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:491
+#: src/dirmngr_ldap.c:490
#, c-format
msgid "no attribute given for query `%s'\n"
msgstr ""
-#: src/dirmngr_ldap.c:497
+#: src/dirmngr_ldap.c:496
msgid "WARNING: using first attribute only\n"
msgstr ""
-#: src/dirmngr_ldap.c:504
+#: src/dirmngr_ldap.c:503
#, c-format
msgid "LDAP init to `%s:%d' failed: %s\n"
msgstr ""
-#: src/dirmngr_ldap.c:510
+#: src/dirmngr_ldap.c:509
#, c-format
msgid "binding to `%s:%d' failed: %s\n"
msgstr ""
-#: src/dirmngr_ldap.c:533
+#: src/dirmngr_ldap.c:532
#, c-format
msgid "searching `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr_ldap.c:564
+#: src/dirmngr_ldap.c:563
#, c-format
msgid "`%s' is not an LDAP URL\n"
msgstr ""
-#: src/dirmngr_ldap.c:570
+#: src/dirmngr_ldap.c:569
#, c-format
msgid "`%s' is an invalid LDAP URL\n"
msgstr ""
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/src/ChangeLog 2006-11-29 13:47:15 UTC (rev 242)
@@ -1,3 +1,16 @@
+2006-11-29 Werner Koch <wk at g10code.com>
+
+ * dirmngr.c (my_strusage): Use macro for the bug report address
+ and the copyright line.
+ * dirmngr-client.c (my_strusage): Ditto.
+ * dirmngr_ldap.c (my_strusage): Ditto.
+
+ * Makefile.am: Do not link against LIBICONV.
+
+2006-11-19 Werner Koch <wk at g10code.com>
+
+ * dirmngr.c: Include i18n.h.
+
2006-11-17 Werner Koch <wk at g10code.com>
* Makefile.am (dirmngr_LDADD): Use LIBASSUAN_PTH_LIBS.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/src/Makefile.am 2006-11-29 13:47:15 UTC (rev 242)
@@ -46,18 +46,18 @@
dirmngr_LDADD = ../jnlib/libjnlib.a $(LIBOBJS) $(LIBASSUAN_PTH_LIBS) \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL) $(LIBICONV)
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL)
dirmngr_ldap_SOURCES = dirmngr_ldap.c i18n.h util.h \
no-libgcrypt.c no-libgcrypt.h
dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS)
dirmngr_ldap_LDFLAGS =
dirmngr_ldap_LDADD = ../jnlib/libjnlib.a $(LIBOBJS) $(GPG_ERROR_LIBS) \
- $(LDAPLIBS) $(LIBINTL) $(LIBICONV)
+ $(LDAPLIBS) $(LIBINTL)
dirmngr_client_SOURCES = dirmngr-client.c i18n.h util.h b64enc.c \
no-libgcrypt.c no-libgcrypt.h
dirmngr_client_LDADD = ../jnlib/libjnlib.a $(LIBOBJS) $(LIBASSUAN_LIBS) \
- $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+ $(GPG_ERROR_LIBS) $(LIBINTL)
Modified: trunk/src/dirmngr-client.c
===================================================================
--- trunk/src/dirmngr-client.c 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/src/dirmngr-client.c 2006-11-29 13:47:15 UTC (rev 242)
@@ -137,11 +137,10 @@
case 11: p = "dirmngr-client (dirmngr)";
break;
case 13: p = VERSION; break;
- case 14: p = "Copyright (C) 2004 g10 Code GmbH"; break;
+ case 14: p = "Copyright (C) " COPYRIGHT_YEAR_NAME; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p =
- _("Please report bugs to <gpa-dev at gnupg.org>.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+ case 49: p = PACKAGE_BUGREPORT; break;
case 1:
case 40: p =
_("Usage: dirmngr-client [options] "
Modified: trunk/src/dirmngr.c
===================================================================
--- trunk/src/dirmngr.c 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/src/dirmngr.c 2006-11-29 13:47:15 UTC (rev 242)
@@ -47,7 +47,9 @@
#include "crlcache.h"
#include "crlfetch.h"
#include "misc.h"
+#include "i18n.h"
+
enum cmd_and_opt_values
{ aNull = 0,
oCsh = 'c',
@@ -216,28 +218,28 @@
static const char *
my_strusage( int level )
{
- const char *p;
- switch( level ) {
- case 11: p = "dirmngr";
- break;
- case 13: p = VERSION; break;
- case 14: p = "Copyright (C) 2006 g10 Code GmbH"; break;
- case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p =
- _("Please report bugs to <gpa-dev at gnupg.org>.\n");
- break;
- case 1:
- case 40: p =
- _("Usage: dirmngr [options] (-h for help)");
- break;
- case 41: p =
- _("Syntax: dirmngr [options] [command [args]]\n"
- "LDAP and OCSP access for GnuPG\n");
- break;
-
- default: p = NULL;
+ const char *p;
+ switch ( level )
+ {
+ case 11: p = "dirmngr";
+ break;
+ case 13: p = VERSION; break;
+ case 14: p = "Copyright (C) " COPYRIGHT_YEAR_NAME; break;
+ case 17: p = PRINTABLE_OS_NAME; break;
+ /* TRANSLATORS: @EMAIL will get replaced by the actual bug
+ reporting address. */
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+ case 49: p = PACKAGE_BUGREPORT; break;
+ case 1:
+ case 40: p = _("Usage: dirmngr [options] (-h for help)");
+ break;
+ case 41: p = _("Syntax: dirmngr [options] [command [args]]\n"
+ "LDAP and OCSP access for GnuPG\n");
+ break;
+
+ default: p = NULL;
}
- return p;
+ return p;
}
Modified: trunk/src/dirmngr_ldap.c
===================================================================
--- trunk/src/dirmngr_ldap.c 2006-11-17 10:48:27 UTC (rev 241)
+++ trunk/src/dirmngr_ldap.c 2006-11-29 13:47:15 UTC (rev 242)
@@ -134,11 +134,10 @@
case 11: p = "dirmngr_ldap (dirmngr)";
break;
case 13: p = VERSION; break;
- case 14: p = "Copyright (C) 2004 g10 Code GmbH"; break;
+ case 14: p = "Copyright (C) " COPYRIGHT_YEAR_NAME; break;
case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p =
- _("Please report bugs to <gpa-dev at gnupg.org>.\n");
- break;
+ case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+ case 49: p = PACKAGE_BUGREPORT; break;
case 1:
case 40: p =
_("Usage: dirmngr_ldap [options] [URL] (-h for help)\n");
More information about the Gnupg-commits
mailing list