About to release 1.3.6

10 files changed, 2329 insertions, 2431 deletions

diff --git a/ChangeLog b/ChangeLog
index adde8b684..172fc86c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-22  Werner Koch  <[email protected]>
+
+	Releases 1.3.6.
+
 2004-05-21  David Shaw  <[email protected]>
 
 	* NEWS: Note --sig-keyserver-url and the ability to use a
diff --git a/NEWS b/NEWS
index 1b09c0116..07fe739eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.3.6
+Noteworthy changes in version 1.3.6 (2004-05-22)
 ------------------------------------------------
 
     * New --keyid-format option that selects short (99242560), long
diff --git a/configure.ac b/configure.ac
index 2e6bf9fd0..3ad88f903 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_PREREQ(2.57)
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.3.6-cvs, [email protected])
+AC_INIT(gnupg, 1.3.6, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
diff --git a/m4/Makefile b/m4/Makefile
deleted file mode 100644
index 2c2d7c54a..000000000
--- a/m4/Makefile
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# m4/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/gnupg
-pkglibdir = $(libdir)/gnupg
-pkgincludedir = $(includedir)/gnupg
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = i686-pc-linux-gnu
-ACLOCAL = ${SHELL} /home/wk/proj/gnupg13/scripts/missing --run aclocal-1.7
-ALLOCA = 
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/wk/proj/gnupg13/scripts/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/wk/proj/gnupg13/scripts/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/wk/proj/gnupg13/scripts/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/wk/proj/gnupg13/scripts/missing --run automake-1.7
-AWK = gawk
-BUILD_INCLUDED_LIBINTL = no
-CAPLIBS = 
-CATOBJEXT = .gmo
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wformat-nonliteral
-CPP = gcc -E
-CPPFLAGS = 
-CROSS_COMPILING_FALSE = 
-CROSS_COMPILING_TRUE = #
-CYGPATH_W = echo
-DATADIRNAME = share
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLIBS = -ldl 
-DOCBOOK_TO_MAN = yes
-DOCBOOK_TO_TEXI = no
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-ENABLE_BZIP2_SUPPORT_FALSE = #
-ENABLE_BZIP2_SUPPORT_TRUE = 
-ENABLE_CARD_SUPPORT_FALSE = #
-ENABLE_CARD_SUPPORT_TRUE = 
-ENABLE_LOCAL_ZLIB_FALSE = 
-ENABLE_LOCAL_ZLIB_TRUE = #
-EXEEXT = 
-FAQPROG = faqprog.pl
-GENCAT = gencat
-GETOPT = 
-GLIBC21 = yes
-GMSGFMT = /usr/bin/msgfmt
-GPGKEYS_HKP = gpgkeys_hkp
-GPGKEYS_LDAP = gpgkeys_ldap
-GPGKEYS_LDAP_FALSE = #
-GPGKEYS_LDAP_TRUE = 
-GPGKEYS_MAILTO = gpgkeys_mailto
-HAVE_DOCBOOK_TO_MAN_FALSE = #
-HAVE_DOCBOOK_TO_MAN_TRUE = 
-HAVE_DOCBOOK_TO_TEXI_FALSE = 
-HAVE_DOCBOOK_TO_TEXI_TRUE = #
-HAVE_DOSISH_SYSTEM_FALSE = 
-HAVE_DOSISH_SYSTEM_TRUE = #
-IDEA_O = idea-stub.o
-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 = 
-LDAPLIBS = -lldap
-LDFLAGS = 
-LIBICONV = 
-LIBINTL = 
-LIBOBJS = 
-LIBS = 
-LIBUSB_LIBS =  -lusb
-LN_S = ln -s
-LTLIBICONV = 
-LTLIBINTL = 
-LTLIBOBJS = 
-MAINT = 
-MAINTAINER_MODE_FALSE = #
-MAINTAINER_MODE_TRUE = 
-MAKEINFO = ${SHELL} /home/wk/proj/gnupg13/scripts/missing --run makeinfo
-MKINSTALLDIRS = $(top_builddir)/scripts/mkinstalldirs
-MPI_EXTRA_ASM_OBJS = 
-MPI_OPT_FLAGS = 
-MPI_SFLAGS = 
-MSGFMT = /usr/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
-NETLIBS = 
-NM = /usr/bin/nm -B
-OBJEXT = o
-PACKAGE = gnupg
-PACKAGE_BUGREPORT = [email protected]
-PACKAGE_NAME = gnupg
-PACKAGE_STRING = gnupg 1.3.5-cvs
-PACKAGE_TARNAME = gnupg
-PACKAGE_VERSION = 1.3.5-cvs
-PATH_SEPARATOR = :
-PERL = /usr/bin/perl
-POSUB = po
-RANLIB = ranlib
-REGEX_O = 
-SENDMAIL = /usr/sbin/sendmail
-SET_MAKE = 
-SHA512_O = sha512.o
-SHELL = /bin/sh
-SRVLIBS = -lresolv 
-STRIP = 
-USE_INCLUDED_LIBINTL = no
-USE_NLS = yes
-VERSION = 1.3.5-cvs
-W32LIBS = 
-WORKING_FAQPROG_FALSE = #
-WORKING_FAQPROG_TRUE = 
-XGETTEXT = /usr/bin/xgettext
-ZLIBS = -lz -lbz2
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = 
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/wk/proj/gnupg13/scripts/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
-target_vendor = pc
-EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
-subdir = m4
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  m4/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/de.po b/po/de.po
index dad52835c..90dba155e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2003-11-27 18:00+0100\n"
+"POT-Creation-Date: 2004-02-26 18:37+0100\n"
 "PO-Revision-Date: 2003-11-27 17:50+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -24,52 +24,53 @@ msgstr "siehe http://www.gnupg.org/de/faq.html f�r weitere Informationen\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:339
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht m�glich\n"
 
-#: util/secmem.c:340
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
-#: util/miscutil.c:297 util/miscutil.c:334
-msgid "yes|yes"
+#: util/miscutil.c:307 util/miscutil.c:344
+#, fuzzy
+msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:298 util/miscutil.c:339
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "jJyY"
 
-#: util/miscutil.c:300 util/miscutil.c:336
-msgid "no|no"
-msgstr ""
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "nein"
 
-#: util/miscutil.c:301 util/miscutil.c:340
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:338
-msgid "quit|quit"
+#: util/miscutil.c:348 g10/keyedit.c:1122
+msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:341
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:384
 msgid "okay|okay"
 msgstr ""
 
-#: util/miscutil.c:376
+#: util/miscutil.c:386
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:377
+#: util/miscutil.c:387
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:378
+#: util/miscutil.c:388
 msgid "cC"
 msgstr "cC"
 
@@ -303,7 +304,7 @@ msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:387 g10/keygen.c:1912 g10/import.c:168
+#: cipher/random.c:387 g10/keygen.c:1917 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -403,7 +404,7 @@ msgstr ""
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid ""
 "@Commands:\n"
 " "
@@ -411,127 +412,127 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:349
+#: g10/g10.c:353
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:353
+#: g10/g10.c:357
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:355
+#: g10/g10.c:359
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:357
+#: g10/g10.c:361
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:359
+#: g10/g10.c:363
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:361
+#: g10/g10.c:365
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "list and check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:363
+#: g10/g10.c:367
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:365
+#: g10/g10.c:369
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:366
+#: g10/g10.c:370
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:368
+#: g10/g10.c:372
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:370
+#: g10/g10.c:374
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/g10.c:373
+#: g10/g10.c:377
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:374
+#: g10/g10.c:378
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:377
+#: g10/g10.c:381
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:380
+#: g10/g10.c:384
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/g10.c:382
+#: g10/g10.c:386
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "print the card status"
 msgstr ""
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "change data on a card"
 msgstr ""
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/g10.c:397
+#: g10/g10.c:402
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:404
+#: g10/g10.c:409
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:408 g10/gpgv.c:64
+#: g10/g10.c:413 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -541,51 +542,51 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:410
+#: g10/g10.c:415
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:412
+#: g10/g10.c:417
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:423
+#: g10/g10.c:428
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:424
+#: g10/g10.c:429
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:429
+#: g10/g10.c:434
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:437
+#: g10/g10.c:444
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:438 g10/gpgv.c:66
+#: g10/g10.c:446 g10/gpgv.c:66
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:449
+#: g10/g10.c:457
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/g10.c:450
+#: g10/g10.c:458
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/g10.c:494
+#: g10/g10.c:502
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:495
+#: g10/g10.c:503
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:518
+#: g10/g10.c:526
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -594,7 +595,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:521
+#: g10/g10.c:529
 msgid ""
 "@\n"
 "Examples:\n"
@@ -614,17 +615,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:699 g10/gpgv.c:95
+#: g10/g10.c:702 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:719
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:706
+#: g10/g10.c:722
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -634,7 +635,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten.\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:733
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -642,73 +643,73 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:720
+#: g10/g10.c:736
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:726 g10/keyedit.c:1732
+#: g10/g10.c:742 g10/keyedit.c:1718
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:732
+#: g10/g10.c:748
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:738 g10/keyedit.c:1778
+#: g10/g10.c:754 g10/keyedit.c:1764
 msgid "Compression: "
 msgstr "Kompression: "
 
-#: g10/g10.c:821
+#: g10/g10.c:837
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:899
+#: g10/g10.c:940
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:917
+#: g10/g10.c:958
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1155
 #, c-format
 msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home Verzeichnisses \"%s\"\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1158
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfiguartionsdatei \"%s\"\n"
 
-#: g10/g10.c:1088
+#: g10/g10.c:1161
 #, c-format
 msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Erweiterung \"%s\"\n"
 
-#: g10/g10.c:1094
+#: g10/g10.c:1167
 #, c-format
 msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Home Verzeichnisses \"%s\"\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1170
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1173
 #, c-format
 msgid "WARNING: unsafe permissions on extension \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Erweiterung \"%s\"\n"
 
-#: g10/g10.c:1106
+#: g10/g10.c:1179
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses des "
 "Home Verzeichniss \"%s\"\n"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1182
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
@@ -716,21 +717,21 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses der "
 "Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1185
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses der "
 "Erweiterung \"%s\"\n"
 
-#: g10/g10.c:1118
+#: g10/g10.c:1191
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte der �bergeordneten Verzeichnisses des Home "
 "Verzeichniss \"%s\"\n"
 
-#: g10/g10.c:1121
+#: g10/g10.c:1194
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -739,374 +740,386 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des �bergeordneten Verzeichnisses der "
 "Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1124
+#: g10/g10.c:1197
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des �bergeordneten Verzeichnisses der "
 "Erweiterung \"%s\"\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1323
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
+
+#: g10/g10.c:1570
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1392
+#: g10/g10.c:1606
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1396
+#: g10/g10.c:1610
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1403
+#: g10/g10.c:1617
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1622 g10/g10.c:2101 g10/g10.c:2112
+#: g10/g10.c:1842 g10/g10.c:2333 g10/g10.c:2344
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:1635
+#: g10/g10.c:1855
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
 "geladen\n"
 
-#: g10/g10.c:1845
+#: g10/g10.c:2066
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1863
+#: g10/g10.c:2084
 msgid "could not parse keyserver URI\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:1872
+#: g10/g10.c:2093
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:1875
+#: g10/g10.c:2096
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:1882
+#: g10/g10.c:2103
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:1885
+#: g10/g10.c:2106
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:1907
+#: g10/g10.c:2129
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige List Option.\n"
 
-#: g10/g10.c:1910
+#: g10/g10.c:2132
 msgid "invalid list options\n"
 msgstr "Ung�ltige List Option\n"
 
-#: g10/g10.c:1931
+#: g10/g10.c:2153
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige Verify Option.\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:2156
 msgid "invalid verify options\n"
 msgstr "Ung�ltige Verify Option\n"
 
-#: g10/g10.c:1941
+#: g10/g10.c:2163
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:2090
+#: g10/g10.c:2322
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2326
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2103
+#: g10/g10.c:2335
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2106
+#: g10/g10.c:2338
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2127
+#: g10/g10.c:2359
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/g10.c:2133
+#: g10/g10.c:2365
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
 "verschl�sseln\n"
 
-#: g10/g10.c:2139
+#: g10/g10.c:2371
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:2152
+#: g10/g10.c:2384
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/g10.c:2220 g10/g10.c:2244
+#: g10/g10.c:2452 g10/g10.c:2476
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2226 g10/g10.c:2250
+#: g10/g10.c:2458 g10/g10.c:2482
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2232
+#: g10/g10.c:2464
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2238
+#: g10/g10.c:2470
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2485
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:2255
+#: g10/g10.c:2487
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:2257
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2489
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:2260
+#: g10/g10.c:2491
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
+
+#: g10/g10.c:2493
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
+
+#: g10/g10.c:2496
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2500
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:2268
-msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
-
-#: g10/g10.c:2274
+#: g10/g10.c:2507
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2516
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2286
+#: g10/g10.c:2520
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2290
+#: g10/g10.c:2524
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2323
+#: g10/g10.c:2557
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeiter noch nicht zusammen mit %s\n"
 
-#: g10/g10.c:2367
+#: g10/g10.c:2604
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2609
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2377
+#: g10/g10.c:2614
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierungsverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2465
+#: g10/g10.c:2702
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2475
+#: g10/g10.c:2713
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:2485
+#: g10/g10.c:2724
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2492
+#: g10/g10.c:2731
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2504
+#: g10/g10.c:2743
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:2517
+#: g10/g10.c:2756
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/g10.c:2519
+#: g10/g10.c:2758
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2522
+#: g10/g10.c:2761
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "Die Benutzung von --symmetric --encrypt ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2779
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2792
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2568
+#: g10/g10.c:2807
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2570
+#: g10/g10.c:2809
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Die Benutzung von --symmetric --sign-encrypt kann nicht zusammen mit --s2k-"
 "mode 0 geschehen.\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2812
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Die Benutzung von --symmetric --sign --encrypt ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/g10.c:2593
+#: g10/g10.c:2832
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2841
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:2627
+#: g10/g10.c:2866
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2874
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:2643
+#: g10/g10.c:2878
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:2651
+#: g10/g10.c:2882
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:2659
+#: g10/g10.c:2886
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:2667
+#: g10/g10.c:2910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:2723 g10/encode.c:470 g10/sign.c:888
+#: g10/g10.c:2966 g10/encode.c:474 g10/sign.c:886
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:2775
+#: g10/g10.c:3018
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an den Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:3020
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserverfehler fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:3022
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:3033
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Schl�sselserversuche fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2800
+#: g10/g10.c:3043
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Schl�sselserver-Refresh fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2841
+#: g10/g10.c:3084
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2849
+#: g10/g10.c:3092
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2936
+#: g10/g10.c:3179
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3052
+#: g10/g10.c:3302
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3056
+#: g10/g10.c:3306
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3059 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:3309 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:3333
+#: g10/g10.c:3583
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1114,23 +1127,23 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3342
+#: g10/g10.c:3592
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"user-notation\"-Name mu� ein '@' Zeichen verwenden\n"
 
-#: g10/g10.c:3352
+#: g10/g10.c:3602
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3386
+#: g10/g10.c:3636
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3388
+#: g10/g10.c:3638
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3421
+#: g10/g10.c:3671
 msgid "the given signature preferred keyserver URL is invalid\n"
 msgstr ""
 "Die angegebene Unterschriften-Bevorzugter-Schl�sselserver-URL ist ung�ltig\n"
@@ -1151,11 +1164,11 @@ msgstr "\"Zeitangaben differieren\" soll lediglich eine Warnung sein"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:95
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:98
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1277,7 +1290,7 @@ msgstr ""
 "Es ist kein \"trust value\" zugewiesen f�r:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:302 g10/mainproc.c:1477
+#: g10/pkclist.c:302 g10/mainproc.c:1508
 msgid "                aka \""
 msgstr "                    alias \""
 
@@ -1418,83 +1431,95 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:619
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
+"nicht vorhanden\n"
+
+#: g10/pkclist.c:628
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
+
+#: g10/pkclist.c:631
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:632
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:638
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:643
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schl�ssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:640
+#: g10/pkclist.c:648
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:659
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:661
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:661
+#: g10/pkclist.c:669
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:670
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:670
+#: g10/pkclist.c:678
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:680
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:824 g10/pkclist.c:860 g10/encode.c:787
+#: g10/pkclist.c:832 g10/pkclist.c:868 g10/encode.c:791
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:870 g10/pkclist.c:1039 g10/pkclist.c:1099
+#: g10/pkclist.c:845 g10/pkclist.c:878 g10/pkclist.c:1047 g10/pkclist.c:1107
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:847 g10/pkclist.c:1071
+#: g10/pkclist.c:855 g10/pkclist.c:1079
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:889
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie k�nnen die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:913
 msgid "Current recipients:\n"
 msgstr "Liste der aktuellen Empf�nger:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:939
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1502,34 +1527,34 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:955
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:952 g10/pkclist.c:1014
+#: g10/pkclist.c:960 g10/pkclist.c:1022
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:970
+#: g10/pkclist.c:978
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:977
+#: g10/pkclist.c:985
 msgid "skipped: public key already set\n"
 msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 
-#: g10/pkclist.c:1006
+#: g10/pkclist.c:1014
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:1051
+#: g10/pkclist.c:1059
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1106
+#: g10/pkclist.c:1114
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1550,76 +1575,76 @@ msgstr "zu viele Hashmethoden Voreinstellungen\n"
 msgid "too many compression preferences\n"
 msgstr "zu viele Kompressionsverhfahren Voreinstellungen\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:312
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ung�ltiger Begriff `%s' in den Voreinstellungen\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:637
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:671
+#: g10/keygen.c:676
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:715
+#: g10/keygen.c:720
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:769 g10/keygen.c:853 g10/keygen.c:944
+#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
+#: g10/keygen.c:779 g10/keygen.c:863 g10/keygen.c:954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1054
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
 
-#: g10/keygen.c:1051
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1056
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:1052
+#: g10/keygen.c:1057
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1054
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1059
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1055
+#: g10/keygen.c:1060
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1057
+#: g10/keygen.c:1062
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1064
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:1062 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
+#: g10/keygen.c:1067 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:1096 g10/keyedit.c:800 g10/revoke.c:637
+#: g10/keygen.c:1101 g10/keyedit.c:800 g10/revoke.c:637
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/keygen.c:1109
+#: g10/keygen.c:1114
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1632,28 +1657,28 @@ msgstr ""
 "              standard Schl�ssell�nge ist 1024 Bit\n"
 "      gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1123
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:1123
+#: g10/keygen.c:1128
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
 
-#: g10/keygen.c:1125
+#: g10/keygen.c:1130
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1133
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1144
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "Sch�sselgr��e zu hoch; %d ist der Maximalwert.\n"
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1149
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1661,11 +1686,11 @@ msgstr ""
 "Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:1147
+#: g10/keygen.c:1152
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1153
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1673,17 +1698,17 @@ msgstr ""
 "Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
 
-#: g10/keygen.c:1157
+#: g10/keygen.c:1162
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:1160 g10/keygen.c:1164
+#: g10/keygen.c:1165 g10/keygen.c:1169
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1215
+#: g10/keygen.c:1220
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1699,7 +1724,7 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:1224
+#: g10/keygen.c:1229
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1715,29 +1740,29 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1251
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:1248
+#: g10/keygen.c:1253
 msgid "Signature is valid for? (0) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1258
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:1258
+#: g10/keygen.c:1263
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s verf�llt nie.\n"
 
-#: g10/keygen.c:1265
+#: g10/keygen.c:1270
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s verf�llt am %s\n"
 
-#: g10/keygen.c:1271
+#: g10/keygen.c:1276
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1745,11 +1770,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1281
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1319
+#: g10/keygen.c:1324
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1765,44 +1790,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1336
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1344
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1341
+#: g10/keygen.c:1346
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1343
+#: g10/keygen.c:1348
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1356
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1367
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1370
+#: g10/keygen.c:1375
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1381
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1399
+#: g10/keygen.c:1404
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1405
+#: g10/keygen.c:1410
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1813,27 +1838,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1410
+#: g10/keygen.c:1415
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 
-#: g10/keygen.c:1415
+#: g10/keygen.c:1420
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1425
+#: g10/keygen.c:1430
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:1426
+#: g10/keygen.c:1431
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1450
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1484
+#: g10/keygen.c:1489
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1841,16 +1866,16 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1493 g10/keyedit.c:1005
+#: g10/keygen.c:1498 g10/keyedit.c:1005
 msgid "passphrase not correctly repeated; try again"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keygen.c:1494
+#: g10/keygen.c:1499
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1500
+#: g10/keygen.c:1505
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1863,7 +1888,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1521
+#: g10/keygen.c:1526
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1874,58 +1899,58 @@ msgstr ""
 "unterst�tzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:2079 g10/revoke.c:214 g10/revoke.c:414
+#: g10/keygen.c:2084 g10/revoke.c:214 g10/revoke.c:414
 msgid "sorry, can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2145
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2213
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2316 g10/keygen.c:2441
+#: g10/keygen.c:2321 g10/keygen.c:2446
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2318 g10/keygen.c:2444
+#: g10/keygen.c:2323 g10/keygen.c:2449
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssel-Stubs nach '%s'\n"
 
-#: g10/keygen.c:2321 g10/keygen.c:2447
+#: g10/keygen.c:2326 g10/keygen.c:2452
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2430
+#: g10/keygen.c:2435
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2436
+#: g10/keygen.c:2441
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2454
+#: g10/keygen.c:2459
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2461
+#: g10/keygen.c:2466
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2484
+#: g10/keygen.c:2489
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2495
+#: g10/keygen.c:2500
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1934,12 +1959,12 @@ msgstr ""
 "werden kann.  Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:2507 g10/keygen.c:2618
+#: g10/keygen.c:2512 g10/keygen.c:2623
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:2553 g10/sign.c:290
+#: g10/keygen.c:2558 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1947,7 +1972,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2555 g10/sign.c:292
+#: g10/keygen.c:2560 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1955,15 +1980,15 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2564
+#: g10/keygen.c:2569
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:2593
+#: g10/keygen.c:2598
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/decrypt.c:96 g10/encode.c:841
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
@@ -1973,7 +1998,7 @@ msgstr "--output funktioniert nicht bei diesem Kommando\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 
-#: g10/encode.c:203 g10/sign.c:1141
+#: g10/encode.c:203 g10/sign.c:1139
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
@@ -1984,470 +2009,504 @@ msgstr ""
 "Aufgrund des S2K-Modus kann ein symmetrisches ESK Packet nicht benutzt "
 "werden\n"
 
-#: g10/encode.c:227 g10/encode.c:540
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "Beglaubigung fehlgeschlagen: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:297 g10/encode.c:586
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:461
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur f�r RSA-Schl�ssel mit maximal 2048 Bit "
 "verschl�sselt werden\n"
 
-#: g10/encode.c:476
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "Die IDEA-Verschl�sselung kann nicht mit allen Zielschl�sseln verwendet "
 "werden.\n"
 
-#: g10/encode.c:522 g10/encode.c:717
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
 "verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:630 g10/sign.c:860
+#: g10/encode.c:634 g10/sign.c:858
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empf�ngervoreinstellungen.\n"
 
-#: g10/encode.c:814
+#: g10/encode.c:818
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/export.c:162 g10/keyedit.c:2705 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:163 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/export.c:184 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:435
+#: g10/export.c:185 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:435
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
 
-#: g10/export.c:193
+#: g10/export.c:194
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
 
-#: g10/export.c:209
+#: g10/export.c:210
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:217
+#: g10/export.c:218
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
-#: g10/export.c:362
+#: g10/export.c:363
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:394
+#: g10/export.c:395
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2631
+#: g10/getkey.c:186 g10/getkey.c:2646
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1598
+#: g10/getkey.c:1620
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %08lX, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2113
+#: g10/getkey.c:2128
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "Es gibt keinen privaten Unterschl�ssel zu dem �ffentlichen Unterschl�ssel %-"
 "8lX - ubergangen!\n"
 
-#: g10/getkey.c:2341
+#: g10/getkey.c:2356
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2403
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
 "�bersprungen\n"
 
-#: g10/import.c:240
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:254
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:266
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:268
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
-#: g10/import.c:271
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:279
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unver�ndert: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:283
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:285
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:296
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:563
+#: g10/import.c:567 g10/import.c:581 g10/import.c:595
 #, c-format
-msgid "key %08lX: Elgamal primary key - this may take some time to import\n"
+msgid "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
 msgstr ""
 
-#: g10/import.c:577 g10/import.c:895
+#: g10/import.c:570
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:584
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
+
+#: g10/import.c:598
+#, fuzzy, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
+
+#: g10/import.c:611
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:637
+#, c-format
+msgid ""
+"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
+msgstr ""
+
+#: g10/import.c:682 g10/import.c:1026
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:597
+#: g10/import.c:702
 #, c-format
 msgid "key %08lX: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %08lX: PKS Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:612
+#: g10/import.c:717
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
 
-#: g10/import.c:618
+#: g10/import.c:723
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:620
+#: g10/import.c:725
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:629 g10/import.c:988
+#: g10/import.c:734 g10/import.c:1133
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:634
+#: g10/import.c:740
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:643
+#: g10/import.c:749
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:648 g10/sign.c:767 g10/sign.c:1003 g10/openfile.c:253
+#: g10/import.c:754 g10/sign.c:765 g10/sign.c:1001 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:651 g10/import.c:737 g10/import.c:922 g10/import.c:1048
+#: g10/import.c:757 g10/import.c:843 g10/import.c:1055 g10/import.c:1193
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:669
+#: g10/import.c:775
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:691
+#: g10/import.c:797
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:708 g10/import.c:1005
+#: g10/import.c:814 g10/import.c:1150
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:715 g10/import.c:1011
+#: g10/import.c:821 g10/import.c:1156
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:746
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:752
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:755
+#: g10/import.c:861
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:758
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:761
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:780
+#: g10/import.c:888
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:901
+#: g10/import.c:1032
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltigem Verschl�sselungsverfahren "
 "%d - �bersprungen\n"
 
-#: g10/import.c:916
+#: g10/import.c:1049
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:927
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#: g10/import.c:943
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:953
+#: g10/import.c:1098
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:982
+#: g10/import.c:1127
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:1022
+#: g10/import.c:1167
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1199
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1263
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1278
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1280
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
 
-#: g10/import.c:1152
+#: g10/import.c:1297
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
 
-#: g10/import.c:1161 g10/import.c:1205
+#: g10/import.c:1306 g10/import.c:1350
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1307
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:1175
+#: g10/import.c:1320
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1341
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r den Schl�sselwiderruf\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1351
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/import.c:1219
+#: g10/import.c:1364
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf entfernt\n"
 
-#: g10/import.c:1258
+#: g10/import.c:1403
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1281
+#: g10/import.c:1426
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1453
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1462
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1334
+#: g10/import.c:1479
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1347
+#: g10/import.c:1492
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1355
+#: g10/import.c:1500
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht erwartete Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:1454
+#: g10/import.c:1599
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1513
+#: g10/import.c:1658
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
 
-#: g10/import.c:1527
+#: g10/import.c:1672
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1730
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1763
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
@@ -2523,12 +2582,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
 #: g10/keyedit.c:501 g10/keyedit.c:521 g10/keyedit.c:542 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1366
+#: g10/keyedit.c:750 g10/keyedit.c:1355
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
 #: g10/keyedit.c:509 g10/keyedit.c:529 g10/keyedit.c:550 g10/keyedit.c:698
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1361
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
@@ -2739,8 +2798,8 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:906 g10/keyedit.c:3615 g10/keyedit.c:3706 g10/keyedit.c:3779
-#: g10/sign.c:370
+#: g10/keyedit.c:906 g10/keyedit.c:3610 g10/keyedit.c:3701 g10/keyedit.c:3774
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -2787,10 +2846,6 @@ msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
 #: g10/keyedit.c:1122
-msgid "quit"
-msgstr "quit"
-
-#: g10/keyedit.c:1122
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
@@ -3102,208 +3157,224 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1187 g10/delkey.c:119
+#: g10/keyedit.c:1187 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keyedit.c:1225
+#: g10/keyedit.c:1218
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1235
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1267
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1297
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1301
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1349
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1368
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1369
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1394
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1426 g10/keyedit.c:1447 g10/keyedit.c:1507
+#: g10/keyedit.c:1414 g10/keyedit.c:1435 g10/keyedit.c:1494
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1416
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1419
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1420
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1470 g10/keyedit.c:1526
+#: g10/keyedit.c:1458 g10/keyedit.c:1513
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1461
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1462
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1497
 msgid "Really revoke all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich widerrufen? "
 
-#: g10/keyedit.c:1511
+#: g10/keyedit.c:1498
 msgid "Really revoke this user ID? "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1530
+#: g10/keyedit.c:1517
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1518
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1557
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1602
-msgid "Current preference list:\n"
-msgstr "Aktuelle Liste der Voreinstellungen:\n"
+#: g10/keyedit.c:1589
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1608
+#: g10/keyedit.c:1595
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1610
+#: g10/keyedit.c:1597
 msgid "Really update the preferences? "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1643
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1659
+#: g10/keyedit.c:1646
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1670
+#: g10/keyedit.c:1656
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1663
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1670
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1682
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1741
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1793
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1804
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2061
+#: g10/keyedit.c:2044
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2048
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2082
-#, c-format
-msgid "created: %s expires: %s"
+#: g10/keyedit.c:2065
+#, fuzzy, c-format
+msgid "created: %s"
 msgstr "erstellt: %s verf�llt: %s"
 
-#: g10/keyedit.c:2097
-#, c-format
-msgid "trust: %-13s"
+#: g10/keyedit.c:2068
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "widerrufen"
+
+#: g10/keyedit.c:2070
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [verf�llt: %s]"
+
+#: g10/keyedit.c:2072
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [verf�llt: %s]"
+
+#: g10/keyedit.c:2089
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " Vertrauen: %-13s"
 
-#: g10/keyedit.c:2098
+#: g10/keyedit.c:2093
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2105
+#: g10/keyedit.c:2100
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
+#: g10/keyedit.c:2114 g10/keyedit.c:2217 g10/keyedit.c:2232
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2130
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2133
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2135
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:2165 g10/mainproc.c:1485 g10/trustdb.c:1166
+#: g10/keyedit.c:2160 g10/keylist.c:709 g10/mainproc.c:1516 g10/trustdb.c:1123
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:2167 g10/mainproc.c:1487 g10/trustdb.c:500
+#: g10/keyedit.c:2162 g10/keylist.c:709 g10/mainproc.c:1518 g10/trustdb.c:500
 msgid "expired"
 msgstr "abgelaufen"
 
-#: g10/keyedit.c:2188
+#: g10/keyedit.c:2183
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2196
+#: g10/keyedit.c:2191
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3311,13 +3382,23 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2256 g10/mainproc.c:924
+#, fuzzy
+msgid "[revoked] "
+msgstr "revkey"
+
+#: g10/keyedit.c:2258
+#, fuzzy
+msgid "[expired] "
+msgstr "expire"
+
+#: g10/keyedit.c:2323
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2387
+#: g10/keyedit.c:2382
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3327,45 +3408,45 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2392 g10/keyedit.c:2665
+#: g10/keyedit.c:2387 g10/keyedit.c:2660
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/N) "
 
-#: g10/keyedit.c:2398
+#: g10/keyedit.c:2393
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie k�nnen einem PGP2-artigen Schl��sel keine Foto-ID hinzuf�gen.\n"
 
-#: g10/keyedit.c:2533
+#: g10/keyedit.c:2528
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2543
+#: g10/keyedit.c:2538
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2547
+#: g10/keyedit.c:2542
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2553
+#: g10/keyedit.c:2548
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2567
+#: g10/keyedit.c:2562
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2568
+#: g10/keyedit.c:2563
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2566
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2655
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3375,96 +3456,96 @@ msgstr ""
 "         Widerrufers kann bei einigen PGP-Versionen zur Zur�ckweisung des\n"
 "         Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2666
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie k�nnen einem PGP2-artigen Schl��sel keinen vorgesehenen Widerrufer "
 "hinzuf�gen.\n"
 
-#: g10/keyedit.c:2694
+#: g10/keyedit.c:2689
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2715
+#: g10/keyedit.c:2710
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schl�ssel kann nicht als designierter Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:2725
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "Ein Schl�ssel kann nicht als sein eigener designierter Widerrufer agieren\n"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2747
 msgid "this key has already been designated as a revoker\n"
 msgstr "Ein Schl�ssel ist bereits als Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2776
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "Einen Schl�ssel mit einem designierter Widerrufer zu versehen, kann nicht "
 "r�ckg�ngig gemacht werden!\n"
 
-#: g10/keyedit.c:2787
+#: g10/keyedit.c:2782
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "M�chten diesen Schl�ssel wirklich als designiertern Widerrufer einstellen? "
 "(j/N): "
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2843
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:2854
+#: g10/keyedit.c:2849
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:2858
+#: g10/keyedit.c:2853
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:2860
+#: g10/keyedit.c:2855
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2900
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:2921
+#: g10/keyedit.c:2916
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3001
+#: g10/keyedit.c:2996
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3038 g10/keyedit.c:3147 g10/keyedit.c:3239
+#: g10/keyedit.c:3033 g10/keyedit.c:3142 g10/keyedit.c:3234
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3198
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3296
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3347
+#: g10/keyedit.c:3342
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3456
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3466
+#: g10/keyedit.c:3461
 #, c-format
 msgid ""
 "\"\n"
@@ -3473,7 +3554,7 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3464
 #, c-format
 msgid ""
 "\"\n"
@@ -3482,65 +3563,65 @@ msgstr ""
 "\"\n"
 "lokal unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3469
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3478
+#: g10/keyedit.c:3473
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3477
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:3507
+#: g10/keyedit.c:3502
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3521
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3529
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3554
+#: g10/keyedit.c:3549
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3564
+#: g10/keyedit.c:3559
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:3566
+#: g10/keyedit.c:3561
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3568
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3598
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3668
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen.\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3685
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNUNG: Eine User-ID Unterschrift liegt %d Sekunden in der Zukunft.\n"
 
-#: g10/keyedit.c:3863
+#: g10/keyedit.c:3858
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3582,288 +3663,298 @@ msgstr "nicht als Klartext darstellbar"
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
-#: g10/keylist.c:636 g10/keylist.c:666 g10/keylist.c:754 g10/keylist.c:783
-#: g10/mainproc.c:895
+#: g10/keylist.c:638 g10/keylist.c:674 g10/keylist.c:776 g10/keylist.c:805
+#: g10/mainproc.c:926
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/keylist.c:1381
+#: g10/keylist.c:670 g10/keylist.c:772
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "revkey"
+
+#: g10/keylist.c:672 g10/keylist.c:774
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [verf�llt: %s]"
+
+#: g10/keylist.c:1393
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1383
+#: g10/keylist.c:1395
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1390
+#: g10/keylist.c:1402
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1392
+#: g10/keylist.c:1404
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1396 g10/keylist.c:1400
+#: g10/keylist.c:1408 g10/keylist.c:1412
 msgid "      Key fingerprint ="
 msgstr " Schl.-Fingerabdruck ="
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame L�nge des verschl�sselten Session-Keys (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 msgstr "Falsche Passphrase oder unbekanntes Verschl�sselungsverfahren (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschl�sselter Sitzungsschl�ssel\n"
 
-#: g10/mainproc.c:302 g10/encr-data.c:66
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschl�sselte Daten\n"
 
-#: g10/mainproc.c:306 g10/encr-data.c:68
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
 
-#: g10/mainproc.c:352
+#: g10/mainproc.c:366
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:421
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:454
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:460
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschl�sselt mit %lu Passphrasen\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschl�sselt mit 1 Passphrase\n"
 
-#: g10/mainproc.c:506 g10/mainproc.c:525
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschl�sselte Daten\n"
 
-#: g10/mainproc.c:513
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschl�sselung nicht verf�gbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:543
+#: g10/mainproc.c:562
 msgid "decryption okay\n"
 msgstr "Entschl�sselung erfolgreich\n"
 
-#: g10/mainproc.c:547
+#: g10/mainproc.c:566
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNUNG: Die Nachricht war nicht gegen Ver�nderungen gesch�tzt\n"
 
-#: g10/mainproc.c:550
+#: g10/mainproc.c:579
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:556
+#: g10/mainproc.c:585
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:575
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:577
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:749
+#: g10/mainproc.c:779
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1248
+#: g10/mainproc.c:1279
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#: g10/mainproc.c:1290 g10/mainproc.c:1300
+#: g10/mainproc.c:1321 g10/mainproc.c:1331
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1342
 #, c-format
 msgid "Signature made %.*s\n"
 msgstr "Unterschrift erstellt durch %.*s\n"
 
-#: g10/mainproc.c:1312
+#: g10/mainproc.c:1343
 #, c-format
 msgid "               using %s key %08lX%08lX\n"
 msgstr "                      mittels %s Schl�ssel %08lX%08lX\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1316
+#: g10/mainproc.c:1347
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#: g10/mainproc.c:1341
+#: g10/mainproc.c:1372
 msgid "Key available at: "
 msgstr "Schl�ssel verf�gbar bei: "
 
-#: g10/mainproc.c:1404 g10/mainproc.c:1440
+#: g10/mainproc.c:1435 g10/mainproc.c:1471
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1405 g10/mainproc.c:1441
+#: g10/mainproc.c:1436 g10/mainproc.c:1472
 msgid "Expired signature from \""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1406 g10/mainproc.c:1442
+#: g10/mainproc.c:1437 g10/mainproc.c:1473
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1444
+#: g10/mainproc.c:1475
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1601
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1606
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verf�llt am %s.\n"
 
-#: g10/mainproc.c:1578
+#: g10/mainproc.c:1609
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1579
+#: g10/mainproc.c:1610
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1611
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1580 g10/trustdb.c:499
+#: g10/mainproc.c:1611 g10/trustdb.c:499
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1600
+#: g10/mainproc.c:1631
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1669 g10/mainproc.c:1685 g10/mainproc.c:1771
+#: g10/mainproc.c:1699 g10/mainproc.c:1715 g10/mainproc.c:1801
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1712
+#: g10/mainproc.c:1742
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1720
+#: g10/mainproc.c:1750
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1777
+#: g10/mainproc.c:1807
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1787
+#: g10/mainproc.c:1817
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschl�sselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:302
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "F�r weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:535
+#: g10/misc.c:491
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mi�billigte Option \"%s\".\n"
 
-#: g10/misc.c:539
+#: g10/misc.c:495
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mi�billigte Option.\n"
 
-#: g10/misc.c:541
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:552
+#: g10/misc.c:508
 msgid "Uncompressed"
 msgstr "unkomprimiert"
 
-#: g10/misc.c:577
+#: g10/misc.c:533
 msgid "uncompressed|none"
 msgstr "uncompressed|none|nicht"
 
-#: g10/misc.c:687
+#: g10/misc.c:643
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:742
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Optionen `%s'\n"
 
-#: g10/misc.c:741
+#: g10/misc.c:767
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -3989,33 +4080,33 @@ msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
-#: g10/plaintext.c:70
+#: g10/plaintext.c:72
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
-#: g10/plaintext.c:112 g10/plaintext.c:127
+#: g10/plaintext.c:114 g10/plaintext.c:132
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/plaintext.c:369
+#: g10/plaintext.c:420
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:373
+#: g10/plaintext.c:424
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:394
+#: g10/plaintext.c:445
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:428
+#: g10/plaintext.c:479
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:436
+#: g10/plaintext.c:487
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -4061,54 +4152,54 @@ msgstr "Teile des geheimen Schl�ssels sind nicht vorhanden\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "Schutzverfahren %d%s wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:244
 msgid "Invalid passphrase; please try again"
 msgstr "Ung�ltiges Mantra; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:247
+#: g10/seckey-cert.c:245
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:307
+#: g10/seckey-cert.c:305
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/seckey-cert.c:345
+#: g10/seckey-cert.c:343
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Die mi�billigte 16-bit Pr�fsumme wird zum Schutz des geheimen Schl�ssels "
 "benutzt\n"
 
-#: g10/sig-check.c:70
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
 
-#: g10/sig-check.c:215
-#, c-format
+#: g10/sig-check.c:146
+#, fuzzy, c-format
 msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
 "signatures!\n"
 msgstr ""
 "Schl�ssel %08lX: Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r "
 "Signaturen NICHT sicher genug!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:155
 #, c-format
 msgid "public key %08lX is %lu second newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel %08lX ist um %lu Sekunde j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:156
 #, c-format
 msgid "public key %08lX is %lu seconds newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel %08lX ist um %lu Sekunden j�nger als die "
 "Unterschrift\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:165
 #, c-format
 msgid ""
 "key %08lX has been created %lu second in future (time warp or clock "
@@ -4117,7 +4208,7 @@ msgstr ""
 "Der Schl�ssel %08lX wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:167
 #, c-format
 msgid ""
 "key %08lX has been created %lu seconds in future (time warp or clock "
@@ -4126,24 +4217,24 @@ msgstr ""
 "Der Schl�ssel %08lX wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise "
 "oder Uhren stimmen nicht �berein)\n"
 
-#: g10/sig-check.c:249
+#: g10/sig-check.c:180
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "Hinweis: Signaturschl�ssel %08lX ist am %s verfallen.\n"
 
-#: g10/sig-check.c:352
+#: g10/sig-check.c:263
 #, c-format
 msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift von Schl�ssel %08lX, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:486
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for subkey revocation signature\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r den Schl�sselwiderruf\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:512
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for subkey binding signature\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
@@ -4197,49 +4288,49 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:373
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:550
+#: g10/sign.c:548
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/sign.c:738
+#: g10/sign.c:736
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:762 g10/sign.c:998
+#: g10/sign.c:760 g10/sign.c:996
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:791
+#: g10/sign.c:789
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/sign.c:883
+#: g10/sign.c:881
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:982
+#: g10/sign.c:980
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schl�ssel machen\n"
 
-#: g10/sign.c:1135
+#: g10/sign.c:1133
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
@@ -4254,12 +4345,12 @@ msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1435
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1442
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
@@ -4288,7 +4379,7 @@ msgstr "%s: Sperre kann nicht erzeugt werden\n"
 msgid "%s: can't make lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
 
-#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1470
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -4328,7 +4419,7 @@ msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
 #: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
-#: g10/tdbio.c:745 g10/tdbio.c:1368 g10/tdbio.c:1395
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
@@ -4338,52 +4429,52 @@ msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1164
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1193
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1211
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1449
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/tdbio.c:1494
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg --fix-trustdb"
@@ -4471,7 +4562,7 @@ msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2152
+#: g10/trustdb.c:551 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
@@ -4486,48 +4577,48 @@ msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 msgid "no need for a trustdb update with \"%s\" trust model\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1264
+#: g10/trustdb.c:793 g10/trustdb.c:1221
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1031
+#: g10/trustdb.c:988
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1035
+#: g10/trustdb.c:992
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
-#: g10/trustdb.c:1903
+#: g10/trustdb.c:1847
 #, fuzzy, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/trustdb.c:1956
+#: g10/trustdb.c:1911
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
-#: g10/trustdb.c:1974
+#: g10/trustdb.c:1925
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 "�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
-#: g10/trustdb.c:1997
+#: g10/trustdb.c:1948
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2083
+#: g10/trustdb.c:2034
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2109
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
@@ -4568,9 +4659,9 @@ msgid "skipped: secret key already present\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "'%s �bersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schl�ssel. Das "
@@ -4648,44 +4739,44 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA ben�tigt einen 160-bit Hash Algorithmus\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(es sei denn, Sie geben den Schl�ssel mittels Fingerprint an)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "Der \"Ownertrust\" wurde gel�scht\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 "Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel \"%s\"!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4696,7 +4787,7 @@ msgstr ""
 "um das \"Netz des Vertrauens\" aufzubauen.  Dieses hat nichts mit dem\n"
 "(implizit erzeugten) \"Netz der Zertifikate\" zu tun."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4708,80 +4799,39 @@ msgstr ""
 "auf deren geheimen Schl�ssel Sie Zugruff haben.\n"
 "Antworten Sie mit \"yes\" um diesen Schl�ssel uneingeschr�nkt zu vertrauen\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr ""
 "Wenn Sie diesen widerrufenen Schl�ssel trotzdem benutzen wollen,\n"
 "so antworten Sie mit \"ja\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Wenn Sie diesen nicht vertrauensw�rdigen Schl�ssel trotzdem benutzen "
 "wollen,\n"
 "so antworten Sie mit \"ja\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"W�hlen Sie die zu verwendende Methode aus.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n"
-"  Unterschrift-Verfahren). Es kann nur zum Unterschreiben und Beglaubigen\n"
-"  benutzt werden. Dies ist das empfohlene Verfahren, da dessen �berpr�fung\n"
-"  wesentlich schneller abl�uft, als die von \"ElGamal\".\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"ElGamal ist ein Verfahren f�r Unterschrift, Beglaubigung und "
-"Verschl�sselung\n"
-"  OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n"
-"  Unterschreiben/Beglaubigen und eines zus�tzlich zum Verschl�sseln.\n"
-"  Eigentlich sind diese Arten identisch; allerdings m�ssen einige Parameter\n"
-"  auf eine besondere Art gew�hlt werden, um einen sicheren Schl�ssel f�r\n"
-"  Unterschriften zu erzeugen. Dieses Programm macht dies zwar so, aber "
-"andere\n"
-"  Programme sind laut der OpenPGP-Spezifikation nicht verpflichtet, die\n"
-"  zweite Art (die mit zus�tzlichem Verschl�sseln) zu verstehen.\n"
-"\n"
-"Der Hauptschl�ssel (\"primary Key\") mu� auf jeden Fall zum Unterschreiben "
-"f�hig\n"
-"sein. Deshalb kann ein nur-Verschl�ssel-ElGamal-Schl�ssel daf�r nicht\n"
-"verwendet werden."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Obwohl diese Schl�ssel in RFC 2440 definiert sind, ist ihre Verwendung "
-"nicht\n"
-"empfohlen. Sie werden n�mlich nicht von allen Programmen unterst�tzt.\n"
-"Au�erdem sind damit ezeugte Unterschriften recht gro� und ihre �berpr�fung\n"
-"ist langsam."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -4792,16 +4842,16 @@ msgstr ""
 "Anwendungsgebiten benutzt werden.  Bitte lassen Sie sich zuerst von \n"
 "einem Sicherheistexperten beraten."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "W�hlen Sie die gew�nschte Schl�ssell�nge"
 
-#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
-#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Geben Sie \"ja\" oder \"nein\" ein"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4813,21 +4863,21 @@ msgstr ""
 "erh�lt dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen versucht\n"
 "der Rechner den Wert als Intervall (von-bis) zu deuten."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Geben Sie den Namen des Schl�sselinhabers ein"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht unbedingt notwendig,\n"
 "aber sehr empfehlenswert."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Geben Sie - bei Bedarf - einen Kommentar ein"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4841,12 +4891,12 @@ msgstr ""
 "F  um mit der Schl�sselerzeugung fortzusetzen.\n"
 "B  um die Schl�sselerzeugung abbrechen."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschl�ssel zu erzeugen."
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4921,11 +4971,11 @@ msgstr ""
 "\n"
 "Wenn Sie nicht wissen, wie Sie antworten sollen, w�hlen Sie \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4933,12 +4983,12 @@ msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu L�SCHEN.\n"
 "Alle Zertifikate werden dann auch weg sein!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschl�ssel zu l�schen"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4950,7 +5000,7 @@ msgstr ""
 "Schl�ssel\n"
 "herzustellen."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4963,7 +5013,7 @@ msgstr ""
 "sie wissen, welcher Schl�ssel verwendet wurde. Denn vielleicht w�rde genau\n"
 "diese Beglaubigung den \"Trust\"-Weg kompletieren."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4971,7 +5021,7 @@ msgstr ""
 "Diese Beglaubigung ist ung�ltig. Es ist sinnvoll sie aus Ihrem\n"
 "Schl�sselbund zu entfernen."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4987,7 +5037,7 @@ msgstr ""
 "irgendeinem Grund nicht g�ltig ist und eine zweite Beglaubigung verf�gbar "
 "ist."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4998,27 +5048,27 @@ msgstr ""
 "betroffenen\n"
 "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Um sicher zu gehen, da� Sie sich bei der Eingabe des Mantras nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
 "�bereinstimmen, wird das Mantra akzeptiert."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift geh�rt"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei �berschreiben m�chten"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -5027,7 +5077,7 @@ msgstr ""
 "Eingabetaste bet�tigen, wird der (in Klammern angezeigte) Standarddateiname\n"
 "verwendet."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -5055,7 +5105,7 @@ msgstr ""
 "      Um bekanntzugeben, da� die User-ID nicht mehr benutzt werden soll.\n"
 "      So weist man normalerweise auf eine ung�ltige E-Mailadresse hin.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -5065,11 +5115,11 @@ msgstr ""
 "Sie diesen Widerruf herausgeben.  Der Text sollte m�glichst knapp sein.\n"
 "Eine Leerzeile beendet die Eingabe.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
@@ -5108,26 +5158,27 @@ msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
 #: g10/keyring.c:1360
-#, c-format
-msgid "checking keyring `%s'\n"
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "Pr�fen des Schl�sselbundes `%s'\n"
 
-#: g10/keyring.c:1398
+#: g10/keyring.c:1406
 #, fuzzy, c-format
-msgid "%lu keys checked so far (%lu signatures)\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1409
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1475
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
 #: g10/photoid.c:65
+#, c-format
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5217,7 +5268,7 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/keyid.c:332 g10/keyid.c:344 g10/keyid.c:356
+#: g10/keyid.c:370 g10/keyid.c:382 g10/keyid.c:394 g10/keyid.c:406
 msgid "never     "
 msgstr ""
 
@@ -5379,15 +5430,79 @@ msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
 msgid "read error: %s\n"
 msgstr "ASCII-H�lle: %s\n"
 
+#~ msgid "quit|quit"
+#~ msgstr "quit"
+
+#~ msgid "Current preference list:\n"
+#~ msgstr "Aktuelle Liste der Voreinstellungen:\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "W�hlen Sie die zu verwendende Methode aus.\n"
+#~ "\n"
+#~ "DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n"
+#~ "  Unterschrift-Verfahren). Es kann nur zum Unterschreiben und "
+#~ "Beglaubigen\n"
+#~ "  benutzt werden. Dies ist das empfohlene Verfahren, da dessen "
+#~ "�berpr�fung\n"
+#~ "  wesentlich schneller abl�uft, als die von \"ElGamal\".\n"
+#~ "\n"
+#~ "ElGamal ist ein Verfahren f�r Unterschrift, Beglaubigung und "
+#~ "Verschl�sselung\n"
+#~ "  OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n"
+#~ "  Unterschreiben/Beglaubigen und eines zus�tzlich zum Verschl�sseln.\n"
+#~ "  Eigentlich sind diese Arten identisch; allerdings m�ssen einige "
+#~ "Parameter\n"
+#~ "  auf eine besondere Art gew�hlt werden, um einen sicheren Schl�ssel f�r\n"
+#~ "  Unterschriften zu erzeugen. Dieses Programm macht dies zwar so, aber "
+#~ "andere\n"
+#~ "  Programme sind laut der OpenPGP-Spezifikation nicht verpflichtet, die\n"
+#~ "  zweite Art (die mit zus�tzlichem Verschl�sseln) zu verstehen.\n"
+#~ "\n"
+#~ "Der Hauptschl�ssel (\"primary Key\") mu� auf jeden Fall zum "
+#~ "Unterschreiben f�hig\n"
+#~ "sein. Deshalb kann ein nur-Verschl�ssel-ElGamal-Schl�ssel daf�r nicht\n"
+#~ "verwendet werden."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Obwohl diese Schl�ssel in RFC 2440 definiert sind, ist ihre Verwendung "
+#~ "nicht\n"
+#~ "empfohlen. Sie werden n�mlich nicht von allen Programmen unterst�tzt.\n"
+#~ "Au�erdem sind damit ezeugte Unterschriften recht gro� und ihre "
+#~ "�berpr�fung\n"
+#~ "ist langsam."
+
 #~ msgid "   (%d) ElGamal (sign and encrypt)\n"
 #~ msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
 #~ msgid "Create anyway? "
 #~ msgstr "Trotzdem erzeugen? "
 
-#~ msgid "no"
-#~ msgstr "nein"
-
 #~ msgid "key marked as ultimately trusted.\n"
 #~ msgstr ""
 #~ "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
@@ -5546,14 +5661,6 @@ msgstr "ASCII-H�lle: %s\n"
 #~ msgid "Set command line to view Photo IDs"
 #~ msgstr "Kommandozeilentext f�r den Foto-Betrachter setzen"
 
-#, fuzzy
-#~ msgid "[revoked] "
-#~ msgstr "revkey"
-
-#, fuzzy
-#~ msgid "[expired] "
-#~ msgstr "expire"
-
 #~ msgid "Notation: "
 #~ msgstr "\"Notation\": "
 
diff --git a/po/[email protected] b/po/[email protected]
index 8e23cfac0..d959f3a21 100644
--- a/po/[email protected]
+++ b/po/[email protected]
diff --git a/po/[email protected] b/po/[email protected]
index d9c31045b..cc1686be7 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,7 +1,7 @@
 # English translations for gnupg package.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2004 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnupg package.
-# Automatically generated, 2003.
+# Automatically generated, 2004.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.3.4\n"
+"Project-Id-Version: gnupg 1.3.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2003-11-27 18:00+0100\n"
-"PO-Revision-Date: 2003-11-27 18:00+0100\n"
+"POT-Creation-Date: 2004-02-26 18:37+0100\n"
+"PO-Revision-Date: 2004-02-26 18:37+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -49,51 +49,51 @@ msgstr "WARNING: using insecure memory!\n"
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "please see http://www.gnupg.org/faq.html for more information\n"
 
-#: util/secmem.c:339
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation is not possible without initialized secure memory\n"
 
-#: util/secmem.c:340
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(you may have used the wrong program for this task)\n"
 
-#: util/miscutil.c:297 util/miscutil.c:334
-msgid "yes|yes"
-msgstr "yes|yes"
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "yes"
 
-#: util/miscutil.c:298 util/miscutil.c:339
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:300 util/miscutil.c:336
-msgid "no|no"
-msgstr "no|no"
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "no"
 
-#: util/miscutil.c:301 util/miscutil.c:340
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:338
-msgid "quit|quit"
-msgstr "quit|quit"
+#: util/miscutil.c:348 g10/keyedit.c:1122
+msgid "quit"
+msgstr "quit"
 
-#: util/miscutil.c:341
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:384
 msgid "okay|okay"
 msgstr "okay|okay"
 
-#: util/miscutil.c:376
+#: util/miscutil.c:386
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:387
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:378
+#: util/miscutil.c:388
 msgid "cC"
 msgstr "cC"
 
@@ -327,7 +327,7 @@ msgstr "you found a bug ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no entropy gathering module detected\n"
 
-#: cipher/random.c:387 g10/keygen.c:1912 g10/import.c:168
+#: cipher/random.c:387 g10/keygen.c:1917 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "can't open ‘%s’: %s\n"
@@ -428,7 +428,7 @@ msgstr "can't gen prime with pbits=%u qbits=%u\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "can't generate a prime with less than %d bits\n"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid ""
 "@Commands:\n"
 " "
@@ -436,127 +436,127 @@ msgstr ""
 "@Commands:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "|[file]|make a signature"
 msgstr "|[file]|make a signature"
 
-#: g10/g10.c:349
+#: g10/g10.c:353
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|make a clear text signature"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/g10.c:353
+#: g10/g10.c:357
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/g10.c:355
+#: g10/g10.c:359
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/g10.c:357
+#: g10/g10.c:361
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/g10.c:359
+#: g10/g10.c:363
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/g10.c:361
+#: g10/g10.c:365
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/g10.c:363
+#: g10/g10.c:367
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/g10.c:365
+#: g10/g10.c:369
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/g10.c:366
+#: g10/g10.c:370
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/g10.c:368
+#: g10/g10.c:372
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/g10.c:370
+#: g10/g10.c:374
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/g10.c:373
+#: g10/g10.c:377
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/g10.c:374
+#: g10/g10.c:378
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/g10.c:377
+#: g10/g10.c:381
 msgid "export keys to a key server"
 msgstr "export keys to a key server"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "import keys from a key server"
 msgstr "import keys from a key server"
 
-#: g10/g10.c:380
+#: g10/g10.c:384
 msgid "search for keys on a key server"
 msgstr "search for keys on a key server"
 
-#: g10/g10.c:382
+#: g10/g10.c:386
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/g10.c:397
+#: g10/g10.c:402
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/g10.c:404
+#: g10/g10.c:409
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|print message digests"
 
-#: g10/g10.c:408 g10/gpgv.c:64
+#: g10/g10.c:413 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -566,51 +566,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:410
+#: g10/g10.c:415
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/g10.c:412
+#: g10/g10.c:417
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|encrypt for NAME"
 
-#: g10/g10.c:423
+#: g10/g10.c:428
 msgid "use this user-id to sign or decrypt"
 msgstr "use this user-id to sign or decrypt"
 
-#: g10/g10.c:424
+#: g10/g10.c:429
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set compress level N (0 disables)"
 
-#: g10/g10.c:429
+#: g10/g10.c:434
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/g10.c:437
+#: g10/g10.c:444
 msgid "use as output file"
 msgstr "use as output file"
 
-#: g10/g10.c:438 g10/gpgv.c:66
+#: g10/g10.c:446 g10/gpgv.c:66
 msgid "verbose"
 msgstr "verbose"
 
-#: g10/g10.c:449
+#: g10/g10.c:457
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/g10.c:450
+#: g10/g10.c:458
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/g10.c:494
+#: g10/g10.c:502
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/g10.c:495
+#: g10/g10.c:503
 msgid "generate PGP 2.x compatible messages"
 msgstr "generate PGP 2.x compatible messages"
 
-#: g10/g10.c:518
+#: g10/g10.c:526
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -618,7 +618,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/g10.c:521
+#: g10/g10.c:529
 msgid ""
 "@\n"
 "Examples:\n"
@@ -638,15 +638,15 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/g10.c:699 g10/gpgv.c:95
+#: g10/g10.c:702 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Please report bugs to <[email protected]>.\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:719
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Usage: gpg [options] [files] (-h for help)"
 
-#: g10/g10.c:706
+#: g10/g10.c:722
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -656,7 +656,7 @@ msgstr ""
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:733
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -664,71 +664,71 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/g10.c:720
+#: g10/g10.c:736
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:726 g10/keyedit.c:1732
+#: g10/g10.c:742 g10/keyedit.c:1718
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:732
+#: g10/g10.c:748
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:738 g10/keyedit.c:1778
+#: g10/g10.c:754 g10/keyedit.c:1764
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:821
+#: g10/g10.c:837
 msgid "usage: gpg [options] "
 msgstr "usage: gpg [options] "
 
-#: g10/g10.c:899
+#: g10/g10.c:940
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/g10.c:917
+#: g10/g10.c:958
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = sign found in group definition “%s”\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1155
 #, c-format
 msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe ownership on homedir “%s”\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1158
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
 
-#: g10/g10.c:1088
+#: g10/g10.c:1161
 #, c-format
 msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "WARNING: unsafe ownership on extension “%s”\n"
 
-#: g10/g10.c:1094
+#: g10/g10.c:1167
 #, c-format
 msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "WARNING: unsafe permissions on homedir “%s”\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1170
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1173
 #, c-format
 msgid "WARNING: unsafe permissions on extension \"%s\"\n"
 msgstr "WARNING: unsafe permissions on extension “%s”\n"
 
-#: g10/g10.c:1106
+#: g10/g10.c:1179
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1182
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
@@ -736,19 +736,19 @@ msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file “%s"
 "[0m”\n"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1185
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on extension “%s”\n"
 
-#: g10/g10.c:1118
+#: g10/g10.c:1191
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
 
-#: g10/g10.c:1121
+#: g10/g10.c:1194
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -757,355 +757,364 @@ msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file “%s"
 "[0m”\n"
 
-#: g10/g10.c:1124
+#: g10/g10.c:1197
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on extension “%s”\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1323
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "unknown configuration item “%s”\n"
+
+#: g10/g10.c:1570
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: old default options file ‘%s’ ignored\n"
 
-#: g10/g10.c:1392
+#: g10/g10.c:1606
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: no default option file ‘%s’\n"
 
-#: g10/g10.c:1396
+#: g10/g10.c:1610
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "option file ‘%s’: %s\n"
 
-#: g10/g10.c:1403
+#: g10/g10.c:1617
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: g10/g10.c:1622 g10/g10.c:2101 g10/g10.c:2112
+#: g10/g10.c:1842 g10/g10.c:2333 g10/g10.c:2344
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s is not for normal use!\n"
 
-#: g10/g10.c:1635
+#: g10/g10.c:1855
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
 
-#: g10/g10.c:1845
+#: g10/g10.c:2066
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is not a valid character set\n"
 
-#: g10/g10.c:1863
+#: g10/g10.c:2084
 msgid "could not parse keyserver URI\n"
 msgstr "could not parse keyserver URI\n"
 
-#: g10/g10.c:1872
+#: g10/g10.c:2093
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/g10.c:1875
+#: g10/g10.c:2096
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/g10.c:1882
+#: g10/g10.c:2103
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/g10.c:1885
+#: g10/g10.c:2106
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/g10.c:1907
+#: g10/g10.c:2129
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/g10.c:1910
+#: g10/g10.c:2132
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/g10.c:1931
+#: g10/g10.c:2153
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:2156
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/g10.c:1941
+#: g10/g10.c:2163
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/g10.c:2090
+#: g10/g10.c:2322
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2326
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/g10.c:2103
+#: g10/g10.c:2335
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/g10.c:2106
+#: g10/g10.c:2338
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/g10.c:2127
+#: g10/g10.c:2359
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
 
-#: g10/g10.c:2133
+#: g10/g10.c:2365
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 
-#: g10/g10.c:2139
+#: g10/g10.c:2371
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 
-#: g10/g10.c:2152
+#: g10/g10.c:2384
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 
-#: g10/g10.c:2220 g10/g10.c:2244
+#: g10/g10.c:2452 g10/g10.c:2476
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/g10.c:2226 g10/g10.c:2250
+#: g10/g10.c:2458 g10/g10.c:2482
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: g10/g10.c:2232
+#: g10/g10.c:2464
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/g10.c:2238
+#: g10/g10.c:2470
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2485
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/g10.c:2255
+#: g10/g10.c:2487
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/g10.c:2257
-msgid "max-cert-depth must be in range 1 to 255\n"
-msgstr "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2489
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth must be in the range from 1 to 255\n"
+
+#: g10/g10.c:2491
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+
+#: g10/g10.c:2493
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/g10.c:2260
+#: g10/g10.c:2496
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2500
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/g10.c:2268
-msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "invalid default-check-level; must be 0, 1, 2, or 3\n"
-
-#: g10/g10.c:2274
+#: g10/g10.c:2507
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2516
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/g10.c:2286
+#: g10/g10.c:2520
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/g10.c:2290
+#: g10/g10.c:2524
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/g10.c:2323
+#: g10/g10.c:2557
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/g10.c:2367
+#: g10/g10.c:2604
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2609
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use digest algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2377
+#: g10/g10.c:2614
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use compression algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2465
+#: g10/g10.c:2702
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/g10.c:2475
+#: g10/g10.c:2713
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/g10.c:2485
+#: g10/g10.c:2724
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2492
+#: g10/g10.c:2731
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2504
+#: g10/g10.c:2743
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:2517
+#: g10/g10.c:2756
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filename]"
 
-#: g10/g10.c:2519
+#: g10/g10.c:2758
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2761
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2779
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2792
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:2568
+#: g10/g10.c:2807
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filename]"
 
-#: g10/g10.c:2570
+#: g10/g10.c:2809
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2812
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 
-#: g10/g10.c:2593
+#: g10/g10.c:2832
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2841
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:2627
+#: g10/g10.c:2866
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2874
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2643
+#: g10/g10.c:2878
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2651
+#: g10/g10.c:2882
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2659
+#: g10/g10.c:2886
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2667
+#: g10/g10.c:2910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:2723 g10/encode.c:470 g10/sign.c:888
+#: g10/g10.c:2966 g10/encode.c:474 g10/sign.c:886
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "can't open %s: %s\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:2775
+#: g10/g10.c:3018
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:3020
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:3022
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:3033
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/g10.c:2800
+#: g10/g10.c:3043
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/g10.c:2841
+#: g10/g10.c:3084
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/g10.c:2849
+#: g10/g10.c:3092
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/g10.c:2936
+#: g10/g10.c:3179
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/g10.c:3052
+#: g10/g10.c:3302
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3056
+#: g10/g10.c:3306
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/g10.c:3059 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:3309 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "can't open ‘%s’\n"
 
-#: g10/g10.c:3333
+#: g10/g10.c:3583
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1113,23 +1122,23 @@ msgstr ""
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/g10.c:3342
+#: g10/g10.c:3592
 msgid "a user notation name must contain the '@' character\n"
 msgstr "a user notation name must contain the ‘@’ character\n"
 
-#: g10/g10.c:3352
+#: g10/g10.c:3602
 msgid "a notation value must not use any control characters\n"
 msgstr "a notation value must not use any control characters\n"
 
-#: g10/g10.c:3386
+#: g10/g10.c:3636
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/g10.c:3388
+#: g10/g10.c:3638
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/g10.c:3421
+#: g10/g10.c:3671
 msgid "the given signature preferred keyserver URL is invalid\n"
 msgstr "the given signature preferred keyserver URL is invalid\n"
 
@@ -1149,11 +1158,11 @@ msgstr "make timestamp conflicts only a warning"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:95
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Usage: gpgv [options] [files] (-h for help)"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:98
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1276,7 +1285,7 @@ msgstr ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:302 g10/mainproc.c:1477
+#: g10/pkclist.c:302 g10/mainproc.c:1508
 msgid "                aka \""
 msgstr "                aka \""
 
@@ -1412,78 +1421,86 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNING: Using untrusted key!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:619
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "WARNING: this key might be revoked (revocation key not present)\n"
+
+#: g10/pkclist.c:628
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "WARNING: This key has been revoked by its designated revoker!\n"
+
+#: g10/pkclist.c:631
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNING: This key has been revoked by its owner!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:632
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         This could mean that the signature is forgery.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:638
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNING: This subkey has been revoked by its owner!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:643
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: This key has been disabled.\n"
 
-#: g10/pkclist.c:640
+#: g10/pkclist.c:648
 msgid "Note: This key has expired!\n"
 msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:659
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:661
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:661
+#: g10/pkclist.c:669
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:670
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:670
+#: g10/pkclist.c:678
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:680
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:824 g10/pkclist.c:860 g10/encode.c:787
+#: g10/pkclist.c:832 g10/pkclist.c:868 g10/encode.c:791
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "you may not use %s while in %s mode\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:870 g10/pkclist.c:1039 g10/pkclist.c:1099
+#: g10/pkclist.c:845 g10/pkclist.c:878 g10/pkclist.c:1047 g10/pkclist.c:1107
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:847 g10/pkclist.c:1071
+#: g10/pkclist.c:855 g10/pkclist.c:1079
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:889
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:913
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:939
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1491,33 +1508,33 @@ msgstr ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:955
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:952 g10/pkclist.c:1014
+#: g10/pkclist.c:960 g10/pkclist.c:1022
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:970
+#: g10/pkclist.c:978
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:977
+#: g10/pkclist.c:985
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:1006
+#: g10/pkclist.c:1014
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "unknown default recipient ‘%s’\n"
 
-#: g10/pkclist.c:1051
+#: g10/pkclist.c:1059
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:1106
+#: g10/pkclist.c:1114
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
@@ -1538,76 +1555,76 @@ msgstr "too many digest preferences\n"
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:312
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:637
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:671
+#: g10/keygen.c:676
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:715
+#: g10/keygen.c:720
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:769 g10/keygen.c:853 g10/keygen.c:944
+#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
+#: g10/keygen.c:779 g10/keygen.c:863 g10/keygen.c:954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1054
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1056
 #, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
-msgstr "   (%d) DSA and ElGamal (default)\n"
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA and Elgamal (default)\n"
 
-#: g10/keygen.c:1052
+#: g10/keygen.c:1057
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign only)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1059
 #, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (encrypt only)\n"
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (encrypt only)\n"
 
-#: g10/keygen.c:1055
+#: g10/keygen.c:1060
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sign only)\n"
 
-#: g10/keygen.c:1057
+#: g10/keygen.c:1062
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1064
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (sign and encrypt)\n"
 
-#: g10/keygen.c:1062 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
+#: g10/keygen.c:1067 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/keygen.c:1096 g10/keyedit.c:800 g10/revoke.c:637
+#: g10/keygen.c:1101 g10/keyedit.c:800 g10/revoke.c:637
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/keygen.c:1109
+#: g10/keygen.c:1114
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1620,28 +1637,28 @@ msgstr ""
 "              default keysize is 1024 bits\n"
 "    highest suggested keysize is 2048 bits\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1123
 msgid "What keysize do you want? (1024) "
 msgstr "What keysize do you want? (1024) "
 
-#: g10/keygen.c:1123
+#: g10/keygen.c:1128
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA only allows keysizes from 512 to 1024\n"
 
-#: g10/keygen.c:1125
+#: g10/keygen.c:1130
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1133
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize too small; 768 is smallest value allowed.\n"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1144
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize too large; %d is largest value allowed.\n"
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1149
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1649,11 +1666,11 @@ msgstr ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 
-#: g10/keygen.c:1147
+#: g10/keygen.c:1152
 msgid "Are you sure that you want this keysize? "
 msgstr "Are you sure that you want this keysize? "
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1153
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1661,17 +1678,17 @@ msgstr ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 
-#: g10/keygen.c:1157
+#: g10/keygen.c:1162
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:1160 g10/keygen.c:1164
+#: g10/keygen.c:1165 g10/keygen.c:1169
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/keygen.c:1215
+#: g10/keygen.c:1220
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1687,7 +1704,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:1224
+#: g10/keygen.c:1229
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1703,29 +1720,29 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1251
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:1248
+#: g10/keygen.c:1253
 msgid "Signature is valid for? (0) "
 msgstr "Signature is valid for? (0) "
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1258
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:1258
+#: g10/keygen.c:1263
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s does not expire at all\n"
 
-#: g10/keygen.c:1265
+#: g10/keygen.c:1270
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expires at %s\n"
 
-#: g10/keygen.c:1271
+#: g10/keygen.c:1276
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1733,11 +1750,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1281
 msgid "Is this correct (y/n)? "
 msgstr "Is this correct (y/n)? "
 
-#: g10/keygen.c:1319
+#: g10/keygen.c:1324
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1753,44 +1770,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1336
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1344
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:1341
+#: g10/keygen.c:1346
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:1343
+#: g10/keygen.c:1348
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1356
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1367
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:1370
+#: g10/keygen.c:1375
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1381
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:1399
+#: g10/keygen.c:1404
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:1405
+#: g10/keygen.c:1410
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1801,27 +1818,27 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1410
+#: g10/keygen.c:1415
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
-#: g10/keygen.c:1415
+#: g10/keygen.c:1420
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1425
+#: g10/keygen.c:1430
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:1426
+#: g10/keygen.c:1431
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1450
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:1484
+#: g10/keygen.c:1489
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1829,16 +1846,16 @@ msgstr ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 
-#: g10/keygen.c:1493 g10/keyedit.c:1005
+#: g10/keygen.c:1498 g10/keyedit.c:1005
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase not correctly repeated; try again"
 
-#: g10/keygen.c:1494
+#: g10/keygen.c:1499
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1500
+#: g10/keygen.c:1505
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1850,7 +1867,7 @@ msgstr ""
 "using this program with the option “--edit-key”.\n"
 "\n"
 
-#: g10/keygen.c:1521
+#: g10/keygen.c:1526
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1862,58 +1879,58 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:2079 g10/revoke.c:214 g10/revoke.c:414
+#: g10/keygen.c:2084 g10/revoke.c:214 g10/revoke.c:414
 msgid "sorry, can't do this in batch mode\n"
 msgstr "sorry, can't do this in batch mode\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2145
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA keypair will have 1024 bits.\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2213
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:2316 g10/keygen.c:2441
+#: g10/keygen.c:2321 g10/keygen.c:2446
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:2318 g10/keygen.c:2444
+#: g10/keygen.c:2323 g10/keygen.c:2449
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "writing secret key stub to ‘%s’\n"
 
-#: g10/keygen.c:2321 g10/keygen.c:2447
+#: g10/keygen.c:2326 g10/keygen.c:2452
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "writing secret key to ‘%s’\n"
 
-#: g10/keygen.c:2430
+#: g10/keygen.c:2435
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:2436
+#: g10/keygen.c:2441
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "no writable secret keyring found: %s\n"
 
-#: g10/keygen.c:2454
+#: g10/keygen.c:2459
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error writing public keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2461
+#: g10/keygen.c:2466
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error writing secret keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2484
+#: g10/keygen.c:2489
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:2495
+#: g10/keygen.c:2500
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1922,34 +1939,34 @@ msgstr ""
 "the command “--edit-key” to generate a secondary key for this "
 "purpose.\n"
 
-#: g10/keygen.c:2507 g10/keygen.c:2618
+#: g10/keygen.c:2512 g10/keygen.c:2623
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:2553 g10/sign.c:290
+#: g10/keygen.c:2558 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2555 g10/sign.c:292
+#: g10/keygen.c:2560 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2564
+#: g10/keygen.c:2569
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:2593
+#: g10/keygen.c:2598
 msgid "Really create? "
 msgstr "Really create? "
 
-#: g10/decrypt.c:96 g10/encode.c:841
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
@@ -1959,7 +1976,7 @@ msgstr "--output doesn't work for this command\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: can't open: %s\n"
 
-#: g10/encode.c:203 g10/sign.c:1141
+#: g10/encode.c:203 g10/sign.c:1139
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
@@ -1968,443 +1985,479 @@ msgstr "error creating passphrase: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 
-#: g10/encode.c:227 g10/encode.c:540
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encode.c:297 g10/encode.c:586
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNING: empty file\n"
 
-#: g10/encode.c:461
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 
-#: g10/encode.c:476
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 
-#: g10/encode.c:522 g10/encode.c:717
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encode.c:630 g10/sign.c:860
+#: g10/encode.c:634 g10/sign.c:858
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
 
-#: g10/encode.c:814
+#: g10/encode.c:818
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s”\n"
 
-#: g10/export.c:162 g10/keyedit.c:2705 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:163 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "key ‘%s’ not found: %s\n"
 
-#: g10/export.c:184 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:435
+#: g10/export.c:185 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:435
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error reading keyblock: %s\n"
 
-#: g10/export.c:193
+#: g10/export.c:194
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "key %08lX: not a rfc2440 key - skipped\n"
 
-#: g10/export.c:209
+#: g10/export.c:210
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "key %08lX: not protected - skipped\n"
 
-#: g10/export.c:217
+#: g10/export.c:218
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "key %08lX: PGP 2.x style key - skipped\n"
 
-#: g10/export.c:362
+#: g10/export.c:363
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr "WARNING: secret key %08lX does not have a simple SK checksum\n"
 
-#: g10/export.c:394
+#: g10/export.c:395
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "too many entries in pk cache - disabled\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2631
+#: g10/getkey.c:186 g10/getkey.c:2646
 msgid "[User id not found]"
 msgstr "[User id not found]"
 
-#: g10/getkey.c:1598
+#: g10/getkey.c:1620
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2113
+#: g10/getkey.c:2128
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "no secret subkey for public subkey %08lX - ignoring\n"
 
-#: g10/getkey.c:2341
+#: g10/getkey.c:2356
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "using secondary key %08lX instead of primary key %08lX\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2403
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "key %08lX: secret key without public key - skipped\n"
 
-#: g10/import.c:240
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "skipping block of type %d\n"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu keys processed so far\n"
 
-#: g10/import.c:254
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error reading ‘%s’: %s\n"
 
-#: g10/import.c:266
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Total number processed: %lu\n"
 
-#: g10/import.c:268
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      skipped new keys: %lu\n"
 
-#: g10/import.c:271
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          w/o user IDs: %lu\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "              imported: %lu"
 
-#: g10/import.c:279
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             unchanged: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          new user IDs: %lu\n"
 
-#: g10/import.c:283
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           new subkeys: %lu\n"
 
-#: g10/import.c:285
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        new signatures: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   new key revocations: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      secret keys read: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  secret keys imported: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " secret keys unchanged: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:296
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          not imported: %lu\n"
 
-#: g10/import.c:563
+#: g10/import.c:567 g10/import.c:581 g10/import.c:595
+#, c-format
+msgid "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
+msgstr "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
+
+#: g10/import.c:570
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr "         “%s”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:584
+#, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "         “%s”: preference for digest algorithm %s\n"
+
+#: g10/import.c:598
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr "         “%s”: preference for compression algorithm %s\n"
+
+#: g10/import.c:611
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr "it is strongly suggested that you update your preferences and\n"
+
+#: g10/import.c:613
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+"re-distribute this key to avoid potential algorithm mismatch problems\n"
+
+#: g10/import.c:637
 #, c-format
-msgid "key %08lX: Elgamal primary key - this may take some time to import\n"
-msgstr "key %08lX: Elgamal primary key - this may take some time to import\n"
+msgid ""
+"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
+msgstr ""
+"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
 
-#: g10/import.c:577 g10/import.c:895
+#: g10/import.c:682 g10/import.c:1026
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "key %08lX: no user ID\n"
 
-#: g10/import.c:597
+#: g10/import.c:702
 #, c-format
 msgid "key %08lX: PKS subkey corruption repaired\n"
 msgstr "key %08lX: PKS subkey corruption repaired\n"
 
-#: g10/import.c:612
+#: g10/import.c:717
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "key %08lX: accepted non self-signed user ID ‘%s’\n"
 
-#: g10/import.c:618
+#: g10/import.c:723
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "key %08lX: no valid user IDs\n"
 
-#: g10/import.c:620
+#: g10/import.c:725
 msgid "this may be caused by a missing self-signature\n"
 msgstr "this may be caused by a missing self-signature\n"
 
-#: g10/import.c:629 g10/import.c:988
+#: g10/import.c:734 g10/import.c:1133
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "key %08lX: public key not found: %s\n"
 
-#: g10/import.c:634
+#: g10/import.c:740
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "key %08lX: new key - skipped\n"
 
-#: g10/import.c:643
+#: g10/import.c:749
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:648 g10/sign.c:767 g10/sign.c:1003 g10/openfile.c:253
+#: g10/import.c:754 g10/sign.c:765 g10/sign.c:1001 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "writing to ‘%s’\n"
 
-#: g10/import.c:651 g10/import.c:737 g10/import.c:922 g10/import.c:1048
+#: g10/import.c:757 g10/import.c:843 g10/import.c:1055 g10/import.c:1193
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error writing keyring ‘%s’: %s\n"
 
-#: g10/import.c:669
+#: g10/import.c:775
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "key %08lX: public key “%s” imported\n"
 
-#: g10/import.c:691
+#: g10/import.c:797
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "key %08lX: doesn't match our copy\n"
 
-#: g10/import.c:708 g10/import.c:1005
+#: g10/import.c:814 g10/import.c:1150
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "key %08lX: can't locate original keyblock: %s\n"
 
-#: g10/import.c:715 g10/import.c:1011
+#: g10/import.c:821 g10/import.c:1156
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "key %08lX: can't read original keyblock: %s\n"
 
-#: g10/import.c:746
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "key %08lX: “%s” 1 new user ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "key %08lX: “%s” %d new user IDs\n"
 
-#: g10/import.c:752
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "key %08lX: “%s” 1 new signature\n"
 
-#: g10/import.c:755
+#: g10/import.c:861
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "key %08lX: “%s” %d new signatures\n"
 
-#: g10/import.c:758
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "key %08lX: “%s” 1 new subkey\n"
 
-#: g10/import.c:761
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "key %08lX: “%s” %d new subkeys\n"
 
-#: g10/import.c:780
+#: g10/import.c:888
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "key %08lX: “%s” not changed\n"
 
-#: g10/import.c:901
+#: g10/import.c:1032
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "key %08lX: secret key with invalid cipher %d - skipped\n"
 
-#: g10/import.c:916
+#: g10/import.c:1049
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no default secret keyring: %s\n"
 
-#: g10/import.c:927
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "key %08lX: secret key imported\n"
 
-#: g10/import.c:943
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "key %08lX: already in secret keyring\n"
 
-#: g10/import.c:953
+#: g10/import.c:1098
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "key %08lX: secret key not found: %s\n"
 
-#: g10/import.c:982
+#: g10/import.c:1127
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "key %08lX: no public key - can't apply revocation certificate\n"
 
-#: g10/import.c:1022
+#: g10/import.c:1167
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "key %08lX: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1199
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "key %08lX: “%s” revocation certificate imported\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1263
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "key %08lX: no user ID for signature\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1278
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "key %08lX: unsupported public key algorithm on user id “%s”\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1280
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "key %08lX: invalid self-signature on user id “%s”\n"
 
-#: g10/import.c:1152
+#: g10/import.c:1297
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "key %08lX: no subkey for key binding\n"
 
-#: g10/import.c:1161 g10/import.c:1205
+#: g10/import.c:1306 g10/import.c:1350
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "key %08lX: unsupported public key algorithm\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1307
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "key %08lX: invalid subkey binding\n"
 
-#: g10/import.c:1175
+#: g10/import.c:1320
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "key %08lX: removed multiple subkey binding\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1341
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "key %08lX: no subkey for key revocation\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1351
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "key %08lX: invalid subkey revocation\n"
 
-#: g10/import.c:1219
+#: g10/import.c:1364
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "key %08lX: removed multiple subkey revocation\n"
 
-#: g10/import.c:1258
+#: g10/import.c:1403
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "key %08lX: skipped user ID '"
 
-#: g10/import.c:1281
+#: g10/import.c:1426
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "key %08lX: skipped subkey\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1453
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "key %08lX: non exportable signature (class %02x) - skipped\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1462
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "key %08lX: revocation certificate at wrong place - skipped\n"
 
-#: g10/import.c:1334
+#: g10/import.c:1479
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "key %08lX: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:1347
+#: g10/import.c:1492
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "key %08lX: subkey signature in wrong place - skipped\n"
 
-#: g10/import.c:1355
+#: g10/import.c:1500
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 
-#: g10/import.c:1454
+#: g10/import.c:1599
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: duplicated user ID detected - merged\n"
 
-#: g10/import.c:1513
+#: g10/import.c:1658
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 
-#: g10/import.c:1527
+#: g10/import.c:1672
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1730
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "key %08lX: “%s” revocation certificate added\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1763
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "key %08lX: direct key signature added\n"
@@ -2483,12 +2536,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID “%s” is revoked."
 
 #: g10/keyedit.c:501 g10/keyedit.c:521 g10/keyedit.c:542 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1366
+#: g10/keyedit.c:750 g10/keyedit.c:1355
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
 #: g10/keyedit.c:509 g10/keyedit.c:529 g10/keyedit.c:550 g10/keyedit.c:698
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1361
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
@@ -2697,8 +2750,8 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Really sign? "
 
-#: g10/keyedit.c:906 g10/keyedit.c:3615 g10/keyedit.c:3706 g10/keyedit.c:3779
-#: g10/sign.c:370
+#: g10/keyedit.c:906 g10/keyedit.c:3610 g10/keyedit.c:3701 g10/keyedit.c:3774
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -2745,10 +2798,6 @@ msgid "moving a key signature to the correct place\n"
 msgstr "moving a key signature to the correct place\n"
 
 #: g10/keyedit.c:1122
-msgid "quit"
-msgstr "quit"
-
-#: g10/keyedit.c:1122
 msgid "quit this menu"
 msgstr "quit this menu"
 
@@ -3060,208 +3109,223 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "show photo ID"
 
-#: g10/keyedit.c:1187 g10/delkey.c:119
+#: g10/keyedit.c:1187 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "can't do that in batchmode\n"
 
-#: g10/keyedit.c:1225
+#: g10/keyedit.c:1218
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error reading secret keyblock ‘%s’: %s\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1235
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1267
 msgid "Command> "
 msgstr "Command> "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1297
 msgid "Need the secret key to do this.\n"
 msgstr "Need the secret key to do this.\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1301
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Please use the command “toggle” first.\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1349
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1368
 msgid "Really sign all user IDs? "
 msgstr "Really sign all user IDs? "
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1369
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Select the user IDs to sign\n"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1394
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/keyedit.c:1426 g10/keyedit.c:1447 g10/keyedit.c:1507
+#: g10/keyedit.c:1414 g10/keyedit.c:1435 g10/keyedit.c:1494
 msgid "You must select at least one user ID.\n"
 msgstr "You must select at least one user ID.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1416
 msgid "You can't delete the last user ID!\n"
 msgstr "You can't delete the last user ID!\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1419
 msgid "Really remove all selected user IDs? "
 msgstr "Really remove all selected user IDs? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1420
 msgid "Really remove this user ID? "
 msgstr "Really remove this user ID? "
 
-#: g10/keyedit.c:1470 g10/keyedit.c:1526
+#: g10/keyedit.c:1458 g10/keyedit.c:1513
 msgid "You must select at least one key.\n"
 msgstr "You must select at least one key.\n"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1461
 msgid "Do you really want to delete the selected keys? "
 msgstr "Do you really want to delete the selected keys? "
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1462
 msgid "Do you really want to delete this key? "
 msgstr "Do you really want to delete this key? "
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1497
 msgid "Really revoke all selected user IDs? "
 msgstr "Really revoke all selected user IDs? "
 
-#: g10/keyedit.c:1511
+#: g10/keyedit.c:1498
 msgid "Really revoke this user ID? "
 msgstr "Really revoke this user ID? "
 
-#: g10/keyedit.c:1530
+#: g10/keyedit.c:1517
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Do you really want to revoke the selected keys? "
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1518
 msgid "Do you really want to revoke this key? "
 msgstr "Do you really want to revoke this key? "
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1557
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Owner trust may not be set while using an user provided trust database\n"
 
-#: g10/keyedit.c:1602
-msgid "Current preference list:\n"
-msgstr "Current preference list:\n"
+#: g10/keyedit.c:1589
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:1608
+#: g10/keyedit.c:1595
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Really update the preferences for the selected user IDs? "
 
-#: g10/keyedit.c:1610
+#: g10/keyedit.c:1597
 msgid "Really update the preferences? "
 msgstr "Really update the preferences? "
 
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1643
 msgid "Save changes? "
 msgstr "Save changes? "
 
-#: g10/keyedit.c:1659
+#: g10/keyedit.c:1646
 msgid "Quit without saving? "
 msgstr "Quit without saving? "
 
-#: g10/keyedit.c:1670
+#: g10/keyedit.c:1656
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1663
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "update secret failed: %s\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1670
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1682
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help”)\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1741
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1793
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1804
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2061
+#: g10/keyedit.c:2044
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "This key may be revoked by %s key "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2048
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2082
+#: g10/keyedit.c:2065
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:2068
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:2070
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:2072
 #, c-format
-msgid "created: %s expires: %s"
-msgstr "created: %s expires: %s"
+msgid "expires: %s"
+msgstr "expires: %s"
 
-#: g10/keyedit.c:2097
+#: g10/keyedit.c:2089
 #, c-format
-msgid "trust: %-13s"
-msgstr "trust: %-13s"
+msgid "trust: %s"
+msgstr "trust: %s"
 
-#: g10/keyedit.c:2098
+#: g10/keyedit.c:2093
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:2105
+#: g10/keyedit.c:2100
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
+#: g10/keyedit.c:2114 g10/keyedit.c:2217 g10/keyedit.c:2232
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  created: %s expires: %s"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2130
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey has been revoked: %s\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2133
 msgid "rev- faked revocation found\n"
 msgstr "rev- faked revocation found\n"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2135
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem checking revocation: %s\n"
 
-#: g10/keyedit.c:2165 g10/mainproc.c:1485 g10/trustdb.c:1166
+#: g10/keyedit.c:2160 g10/keylist.c:709 g10/mainproc.c:1516 g10/trustdb.c:1123
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:2167 g10/mainproc.c:1487 g10/trustdb.c:500
+#: g10/keyedit.c:2162 g10/keylist.c:709 g10/mainproc.c:1518 g10/trustdb.c:500
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:2188
+#: g10/keyedit.c:2183
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:2196
+#: g10/keyedit.c:2191
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3269,7 +3333,15 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2256 g10/mainproc.c:924
+msgid "[revoked] "
+msgstr "[revoked] "
+
+#: g10/keyedit.c:2258
+msgid "[expired] "
+msgstr "[expired] "
+
+#: g10/keyedit.c:2323
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3277,7 +3349,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2387
+#: g10/keyedit.c:2382
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3287,45 +3359,45 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2392 g10/keyedit.c:2665
+#: g10/keyedit.c:2387 g10/keyedit.c:2660
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:2398
+#: g10/keyedit.c:2393
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:2533
+#: g10/keyedit.c:2528
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:2543
+#: g10/keyedit.c:2538
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:2547
+#: g10/keyedit.c:2542
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:2553
+#: g10/keyedit.c:2548
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:2567
+#: g10/keyedit.c:2562
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Deleted %d signature.\n"
 
-#: g10/keyedit.c:2568
+#: g10/keyedit.c:2563
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2566
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2655
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3335,88 +3407,88 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2666
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:2694
+#: g10/keyedit.c:2689
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:2715
+#: g10/keyedit.c:2710
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:2725
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2747
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2776
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:2787
+#: g10/keyedit.c:2782
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2843
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Please remove selections from the secret keys.\n"
 
-#: g10/keyedit.c:2854
+#: g10/keyedit.c:2849
 msgid "Please select at most one secondary key.\n"
 msgstr "Please select at most one secondary key.\n"
 
-#: g10/keyedit.c:2858
+#: g10/keyedit.c:2853
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changing expiration time for a secondary key.\n"
 
-#: g10/keyedit.c:2860
+#: g10/keyedit.c:2855
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2900
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:2921
+#: g10/keyedit.c:2916
 msgid "No corresponding signature in secret ring\n"
 msgstr "No corresponding signature in secret ring\n"
 
-#: g10/keyedit.c:3001
+#: g10/keyedit.c:2996
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:3038 g10/keyedit.c:3147 g10/keyedit.c:3239
+#: g10/keyedit.c:3033 g10/keyedit.c:3142 g10/keyedit.c:3234
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "skipping v3 self-signature on user id “%s”\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3198
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3296
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:3347
+#: g10/keyedit.c:3342
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No secondary key with index %d\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3456
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3466
+#: g10/keyedit.c:3461
 #, c-format
 msgid ""
 "\"\n"
@@ -3425,7 +3497,7 @@ msgstr ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3464
 #, c-format
 msgid ""
 "\"\n"
@@ -3434,65 +3506,65 @@ msgstr ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3469
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:3478
+#: g10/keyedit.c:3473
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3477
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:3507
+#: g10/keyedit.c:3502
 msgid "You have signed these user IDs:\n"
 msgstr "You have signed these user IDs:\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3521
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signed by %08lX at %s%s%s\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3529
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revoked by %08lX at %s\n"
 
-#: g10/keyedit.c:3554
+#: g10/keyedit.c:3549
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:3564
+#: g10/keyedit.c:3559
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signed by %08lX at %s%s\n"
 
-#: g10/keyedit.c:3566
+#: g10/keyedit.c:3561
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3568
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3598
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3668
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3685
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:3863
+#: g10/keyedit.c:3858
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
@@ -3533,285 +3605,295 @@ msgstr "not human readable"
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:636 g10/keylist.c:666 g10/keylist.c:754 g10/keylist.c:783
-#: g10/mainproc.c:895
+#: g10/keylist.c:638 g10/keylist.c:674 g10/keylist.c:776 g10/keylist.c:805
+#: g10/mainproc.c:926
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expires: %s]"
 
-#: g10/keylist.c:1381
+#: g10/keylist.c:670 g10/keylist.c:772
+#, c-format
+msgid " [revoked: %s]"
+msgstr " [revoked: %s]"
+
+#: g10/keylist.c:672 g10/keylist.c:774
+#, c-format
+msgid " [expired: %s]"
+msgstr " [expired: %s]"
+
+#: g10/keylist.c:1393
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:1383
+#: g10/keylist.c:1395
 msgid "     Subkey fingerprint:"
 msgstr "     Subkey fingerprint:"
 
-#: g10/keylist.c:1390
+#: g10/keylist.c:1402
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:1392
+#: g10/keylist.c:1404
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:1396 g10/keylist.c:1400
+#: g10/keylist.c:1408 g10/keylist.c:1412
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "weird size for an encrypted session key (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 msgstr "bad passphrase or unknown cipher algorithm (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s encrypted session key\n"
 
-#: g10/mainproc.c:302 g10/encr-data.c:66
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s encrypted data\n"
 
-#: g10/mainproc.c:306 g10/encr-data.c:68
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/mainproc.c:352
+#: g10/mainproc.c:366
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "public key is %08lX\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:421
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:454
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encrypted with %s key, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:506 g10/mainproc.c:525
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:513
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:543
+#: g10/mainproc.c:562
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:547
+#: g10/mainproc.c:566
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:550
+#: g10/mainproc.c:579
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:556
+#: g10/mainproc.c:585
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:575
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:577
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:749
+#: g10/mainproc.c:779
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1248
+#: g10/mainproc.c:1279
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1290 g10/mainproc.c:1300
+#: g10/mainproc.c:1321 g10/mainproc.c:1331
 msgid "can't handle these multiple signatures\n"
 msgstr "can't handle these multiple signatures\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1342
 #, c-format
 msgid "Signature made %.*s\n"
 msgstr "Signature made %.*s\n"
 
-#: g10/mainproc.c:1312
+#: g10/mainproc.c:1343
 #, c-format
 msgid "               using %s key %08lX%08lX\n"
 msgstr "               using %s key %08lX%08lX\n"
 
-#: g10/mainproc.c:1316
+#: g10/mainproc.c:1347
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature made %.*s using %s key ID %08lX\n"
 
-#: g10/mainproc.c:1341
+#: g10/mainproc.c:1372
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:1404 g10/mainproc.c:1440
+#: g10/mainproc.c:1435 g10/mainproc.c:1471
 msgid "BAD signature from \""
 msgstr "BAD signature from \""
 
-#: g10/mainproc.c:1405 g10/mainproc.c:1441
+#: g10/mainproc.c:1436 g10/mainproc.c:1472
 msgid "Expired signature from \""
 msgstr "Expired signature from \""
 
-#: g10/mainproc.c:1406 g10/mainproc.c:1442
+#: g10/mainproc.c:1437 g10/mainproc.c:1473
 msgid "Good signature from \""
 msgstr "Good signature from \""
 
-#: g10/mainproc.c:1444
+#: g10/mainproc.c:1475
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1601
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1606
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:1578
+#: g10/mainproc.c:1609
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, digest algorithm %s\n"
 
-#: g10/mainproc.c:1579
+#: g10/mainproc.c:1610
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1611
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:1580 g10/trustdb.c:499
+#: g10/mainproc.c:1611 g10/trustdb.c:499
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:1600
+#: g10/mainproc.c:1631
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:1669 g10/mainproc.c:1685 g10/mainproc.c:1771
+#: g10/mainproc.c:1699 g10/mainproc.c:1715 g10/mainproc.c:1801
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:1712
+#: g10/mainproc.c:1742
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:1720
+#: g10/mainproc.c:1750
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:1777
+#: g10/mainproc.c:1807
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
 
-#: g10/mainproc.c:1787
+#: g10/mainproc.c:1817
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "invalid root packet detected in proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "can't disable core dumps: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimental algorithms should not be used!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "this cipher algorithm is deprecated; please use a more standard one!\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "the IDEA cipher plugin is not present\n"
 
-#: g10/misc.c:302
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 
-#: g10/misc.c:535
+#: g10/misc.c:491
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s”\n"
 
-#: g10/misc.c:539
+#: g10/misc.c:495
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s” is a deprecated option\n"
 
-#: g10/misc.c:541
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "please use “%s%s” instead\n"
 
-#: g10/misc.c:552
+#: g10/misc.c:508
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
-#: g10/misc.c:577
+#: g10/misc.c:533
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:687
+#: g10/misc.c:643
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:742
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:741
+#: g10/misc.c:767
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "unknown option ‘%s’\n"
@@ -3936,32 +4018,32 @@ msgstr "%u-bit %s key, ID %08lX, created %s"
 msgid "Repeat passphrase: "
 msgstr "Repeat passphrase: "
 
-#: g10/plaintext.c:70
+#: g10/plaintext.c:72
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data not saved; use option “--output” to save it\n"
 
-#: g10/plaintext.c:112 g10/plaintext.c:127
+#: g10/plaintext.c:114 g10/plaintext.c:132
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creating ‘%s’: %s\n"
 
-#: g10/plaintext.c:369
+#: g10/plaintext.c:420
 msgid "Detached signature.\n"
 msgstr "Detached signature.\n"
 
-#: g10/plaintext.c:373
+#: g10/plaintext.c:424
 msgid "Please enter name of data file: "
 msgstr "Please enter name of data file: "
 
-#: g10/plaintext.c:394
+#: g10/plaintext.c:445
 msgid "reading stdin ...\n"
 msgstr "reading stdin ...\n"
 
-#: g10/plaintext.c:428
+#: g10/plaintext.c:479
 msgid "no signed data\n"
 msgstr "no signed data\n"
 
-#: g10/plaintext.c:436
+#: g10/plaintext.c:487
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "can't open signed data ‘%s’\n"
@@ -4007,47 +4089,47 @@ msgstr "secret key parts are not available\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protection algorithm %d%s is not supported\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:244
 msgid "Invalid passphrase; please try again"
 msgstr "Invalid passphrase; please try again"
 
-#: g10/seckey-cert.c:247
+#: g10/seckey-cert.c:245
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:307
+#: g10/seckey-cert.c:305
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "WARNING: Weak key detected - please change passphrase again.\n"
 
-#: g10/seckey-cert.c:345
+#: g10/seckey-cert.c:343
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
 
-#: g10/sig-check.c:70
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature digest conflict in message\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:146
 #, c-format
 msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
 "signatures!\n"
 msgstr ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
 "signatures!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:155
 #, c-format
 msgid "public key %08lX is %lu second newer than the signature\n"
 msgstr "public key %08lX is %lu second newer than the signature\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:156
 #, c-format
 msgid "public key %08lX is %lu seconds newer than the signature\n"
 msgstr "public key %08lX is %lu seconds newer than the signature\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:165
 #, c-format
 msgid ""
 "key %08lX has been created %lu second in future (time warp or clock "
@@ -4056,7 +4138,7 @@ msgstr ""
 "key %08lX has been created %lu second in future (time warp or clock "
 "problem)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:167
 #, c-format
 msgid ""
 "key %08lX has been created %lu seconds in future (time warp or clock "
@@ -4065,22 +4147,22 @@ msgstr ""
 "key %08lX has been created %lu seconds in future (time warp or clock "
 "problem)\n"
 
-#: g10/sig-check.c:249
+#: g10/sig-check.c:180
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTE: signature key %08lX expired %s\n"
 
-#: g10/sig-check.c:352
+#: g10/sig-check.c:263
 #, c-format
 msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
 msgstr "assuming bad signature from key %08lX due to an unknown critical bit\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:486
 #, c-format
 msgid "key %08lX: no subkey for subkey revocation signature\n"
 msgstr "key %08lX: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:512
 #, c-format
 msgid "key %08lX: no subkey for subkey binding signature\n"
 msgstr "key %08lX: no subkey for subkey binding signature\n"
@@ -4123,45 +4205,45 @@ msgstr ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:373
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:550
+#: g10/sign.c:548
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/sign.c:738
+#: g10/sign.c:736
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:762 g10/sign.c:998
+#: g10/sign.c:760 g10/sign.c:996
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "can't create %s: %s\n"
 
-#: g10/sign.c:791
+#: g10/sign.c:789
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n"
 
-#: g10/sign.c:883
+#: g10/sign.c:881
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:982
+#: g10/sign.c:980
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:1135
+#: g10/sign.c:1133
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s encryption will be used\n"
@@ -4176,12 +4258,12 @@ msgstr "can't handle text lines longer than %d characters\n"
 msgid "input line longer than %d characters\n"
 msgstr "input line longer than %d characters\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1435
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1442
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -4210,7 +4292,7 @@ msgstr "%s: can't create lock\n"
 msgid "%s: can't make lock\n"
 msgstr "%s: can't make lock\n"
 
-#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1470
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: can't create: %s\n"
@@ -4250,7 +4332,7 @@ msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
 #: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
-#: g10/tdbio.c:745 g10/tdbio.c:1368 g10/tdbio.c:1395
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
@@ -4260,52 +4342,52 @@ msgstr "%s: error reading version record: %s\n"
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1164
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1193
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1211
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1449
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1494
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "the trustdb is corrupted; please run “gpg --fix-trustdb”.\n"
 
@@ -4388,7 +4470,7 @@ msgstr "ultimate"
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2152
+#: g10/trustdb.c:551 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -4403,46 +4485,46 @@ msgstr "no need for a trustdb check with “%s” trust model\n"
 msgid "no need for a trustdb update with \"%s\" trust model\n"
 msgstr "no need for a trustdb update with “%s” trust model\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1264
+#: g10/trustdb.c:793 g10/trustdb.c:1221
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "public key %08lX not found: %s\n"
 
-#: g10/trustdb.c:1031
+#: g10/trustdb.c:988
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1035
+#: g10/trustdb.c:992
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:1903
+#: g10/trustdb.c:1847
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d keys processed (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:1956
+#: g10/trustdb.c:1911
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:1974
+#: g10/trustdb.c:1925
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "public key of ultimately trusted key %08lX not found\n"
 
-#: g10/trustdb.c:1997
+#: g10/trustdb.c:1948
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 
-#: g10/trustdb.c:2083
+#: g10/trustdb.c:2034
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2109
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -4483,10 +4565,10 @@ msgstr "skipped: secret key already present\n"
 #: g10/skclist.c:179
 #, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"skipped ‘%s’: this is a PGP generated ElGamal key which is not secure "
+"skipped ‘%s’: this is a PGP generated Elgamal key which is not secure "
 "for signatures!\n"
 
 #: g10/openfile.c:84
@@ -4559,41 +4641,41 @@ msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA requires the use of a 160 bit hash algorithm\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(unless you specify the key by fingerprint)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "can't do that in batchmode without “--yes”\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Delete this key from the keyring? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "This is a secret key! - really delete? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "deleting keyblock failed: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "ownertrust information cleared\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "there is a secret key for public key “%s”!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use option “--delete-secret-keys” to delete it first.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4603,7 +4685,7 @@ msgstr ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4615,69 +4697,45 @@ msgstr ""
 "access to the secret key.  Answer “yes” to set this key to\n"
 "ultimately trusted\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "If you want to use this revoked key anyway, answer “yes”."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "If you want to use this untrusted key anyway, answer “yes”."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Enter the user ID of the addressee to whom you want to send the message."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
-msgstr ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -4687,16 +4745,16 @@ msgstr ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Enter the size of the key"
 
-#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
-#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Answer “yes” or “no”"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4708,19 +4766,19 @@ msgstr ""
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Enter the name of the key holder"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "please enter an optional but highly suggested email address"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Please enter an optional comment"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4734,12 +4792,12 @@ msgstr ""
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "Answer “yes” (or just “y”) if it is okay to generate the sub key."
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4818,11 +4876,11 @@ msgstr ""
 "\n"
 "If you don't know what the right answer is, answer “0”."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Answer “yes” is you want to sign ALL the user IDs"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4830,11 +4888,11 @@ msgstr ""
 "Answer “yes” if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Answer “yes” if it is okay to delete the subkey"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4844,7 +4902,7 @@ msgstr ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4856,7 +4914,7 @@ msgstr ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4864,7 +4922,7 @@ msgstr ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4878,7 +4936,7 @@ msgstr ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4888,23 +4946,23 @@ msgstr ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Please enter the passhrase; this is a secret sentence \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Please repeat the last passphrase, so you are sure what you typed in."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "Give the name of the file to which the signature applies"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Answer “yes” if it is okay to overwrite the file"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4912,7 +4970,7 @@ msgstr ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4940,7 +4998,7 @@ msgstr ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4950,11 +5008,11 @@ msgstr ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "No help available"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No help available for ‘%s’"
@@ -4994,25 +5052,26 @@ msgstr "Please fix this possible security flaw\n"
 
 #: g10/keyring.c:1360
 #, c-format
-msgid "checking keyring `%s'\n"
-msgstr "checking keyring ‘%s’\n"
+msgid "caching keyring `%s'\n"
+msgstr "caching keyring ‘%s’\n"
 
-#: g10/keyring.c:1398
+#: g10/keyring.c:1406
 #, c-format
-msgid "%lu keys checked so far (%lu signatures)\n"
-msgstr "%lu keys checked so far (%lu signatures)\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu keys cached so far (%lu signatures)\n"
 
-#: g10/keyring.c:1409
+#: g10/keyring.c:1418
 #, c-format
-msgid "%lu keys checked (%lu signatures)\n"
-msgstr "%lu keys checked (%lu signatures)\n"
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu keys cached (%lu signatures)\n"
 
-#: g10/keyring.c:1475
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring created\n"
 
 #: g10/photoid.c:65
+#, c-format
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5104,7 +5163,7 @@ msgstr "WARNING: unable to remove tempfile (%s) ‘%s’: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNING: unable to remove temp directory ‘%s’: %s\n"
 
-#: g10/keyid.c:332 g10/keyid.c:344 g10/keyid.c:356
+#: g10/keyid.c:370 g10/keyid.c:382 g10/keyid.c:394 g10/keyid.c:406
 msgid "never     "
 msgstr "never     "
 
diff --git a/po/[email protected] b/po/[email protected]
index 510089699..0998dd911 100644
--- a/po/[email protected]
+++ b/po/[email protected]
diff --git a/po/[email protected] b/po/[email protected]
index b244cdbd5..77a81ce79 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,7 +1,7 @@
 # English translations for gnupg package.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2004 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnupg package.
-# Automatically generated, 2003.
+# Automatically generated, 2004.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.3.4\n"
+"Project-Id-Version: gnupg 1.3.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2003-11-27 18:00+0100\n"
-"PO-Revision-Date: 2003-11-27 18:00+0100\n"
+"POT-Creation-Date: 2004-02-26 18:37+0100\n"
+"PO-Revision-Date: 2004-02-26 18:37+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -46,51 +46,51 @@ msgstr "WARNING: using insecure memory!\n"
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "please see http://www.gnupg.org/faq.html for more information\n"
 
-#: util/secmem.c:339
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation is not possible without initialized secure memory\n"
 
-#: util/secmem.c:340
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(you may have used the wrong program for this task)\n"
 
-#: util/miscutil.c:297 util/miscutil.c:334
-msgid "yes|yes"
-msgstr "yes|yes"
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "yes"
 
-#: util/miscutil.c:298 util/miscutil.c:339
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:300 util/miscutil.c:336
-msgid "no|no"
-msgstr "no|no"
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "no"
 
-#: util/miscutil.c:301 util/miscutil.c:340
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:338
-msgid "quit|quit"
-msgstr "quit|quit"
+#: util/miscutil.c:348 g10/keyedit.c:1122
+msgid "quit"
+msgstr "quit"
 
-#: util/miscutil.c:341
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:384
 msgid "okay|okay"
 msgstr "okay|okay"
 
-#: util/miscutil.c:376
+#: util/miscutil.c:386
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:377
+#: util/miscutil.c:387
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:378
+#: util/miscutil.c:388
 msgid "cC"
 msgstr "cC"
 
@@ -324,7 +324,7 @@ msgstr "you found a bug ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no entropy gathering module detected\n"
 
-#: cipher/random.c:387 g10/keygen.c:1912 g10/import.c:168
+#: cipher/random.c:387 g10/keygen.c:1917 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "can't open ‘%s’: %s\n"
@@ -425,7 +425,7 @@ msgstr "can't gen prime with pbits=%u qbits=%u\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "can't generate a prime with less than %d bits\n"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid ""
 "@Commands:\n"
 " "
@@ -433,127 +433,127 @@ msgstr ""
 "@Commands:\n"
 " "
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "|[file]|make a signature"
 msgstr "|[file]|make a signature"
 
-#: g10/g10.c:349
+#: g10/g10.c:353
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|make a clear text signature"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/g10.c:351
+#: g10/g10.c:355
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/g10.c:353
+#: g10/g10.c:357
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/g10.c:355
+#: g10/g10.c:359
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/g10.c:357
+#: g10/g10.c:361
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/g10.c:359
+#: g10/g10.c:363
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/g10.c:361
+#: g10/g10.c:365
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/g10.c:363
+#: g10/g10.c:367
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/g10.c:365
+#: g10/g10.c:369
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/g10.c:366
+#: g10/g10.c:370
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/g10.c:368
+#: g10/g10.c:372
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/g10.c:369
+#: g10/g10.c:373
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/g10.c:370
+#: g10/g10.c:374
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/g10.c:373
+#: g10/g10.c:377
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/g10.c:374
+#: g10/g10.c:378
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/g10.c:376
+#: g10/g10.c:380
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/g10.c:377
+#: g10/g10.c:381
 msgid "export keys to a key server"
 msgstr "export keys to a key server"
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "import keys from a key server"
 msgstr "import keys from a key server"
 
-#: g10/g10.c:380
+#: g10/g10.c:384
 msgid "search for keys on a key server"
 msgstr "search for keys on a key server"
 
-#: g10/g10.c:382
+#: g10/g10.c:386
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/g10.c:389
+#: g10/g10.c:393
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/g10.c:390
+#: g10/g10.c:394
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/g10.c:397
+#: g10/g10.c:402
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/g10.c:404
+#: g10/g10.c:409
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|print message digests"
 
-#: g10/g10.c:408 g10/gpgv.c:64
+#: g10/g10.c:413 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -563,51 +563,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:410
+#: g10/g10.c:415
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/g10.c:412
+#: g10/g10.c:417
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|encrypt for NAME"
 
-#: g10/g10.c:423
+#: g10/g10.c:428
 msgid "use this user-id to sign or decrypt"
 msgstr "use this user-id to sign or decrypt"
 
-#: g10/g10.c:424
+#: g10/g10.c:429
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set compress level N (0 disables)"
 
-#: g10/g10.c:429
+#: g10/g10.c:434
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/g10.c:437
+#: g10/g10.c:444
 msgid "use as output file"
 msgstr "use as output file"
 
-#: g10/g10.c:438 g10/gpgv.c:66
+#: g10/g10.c:446 g10/gpgv.c:66
 msgid "verbose"
 msgstr "verbose"
 
-#: g10/g10.c:449
+#: g10/g10.c:457
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/g10.c:450
+#: g10/g10.c:458
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/g10.c:494
+#: g10/g10.c:502
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/g10.c:495
+#: g10/g10.c:503
 msgid "generate PGP 2.x compatible messages"
 msgstr "generate PGP 2.x compatible messages"
 
-#: g10/g10.c:518
+#: g10/g10.c:526
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -615,7 +615,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/g10.c:521
+#: g10/g10.c:529
 msgid ""
 "@\n"
 "Examples:\n"
@@ -635,15 +635,15 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/g10.c:699 g10/gpgv.c:95
+#: g10/g10.c:702 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Please report bugs to <[email protected]>.\n"
 
-#: g10/g10.c:703
+#: g10/g10.c:719
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Usage: gpg [options] [files] (-h for help)"
 
-#: g10/g10.c:706
+#: g10/g10.c:722
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -653,7 +653,7 @@ msgstr ""
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:733
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -661,88 +661,88 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/g10.c:720
+#: g10/g10.c:736
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:726 g10/keyedit.c:1732
+#: g10/g10.c:742 g10/keyedit.c:1718
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:732
+#: g10/g10.c:748
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:738 g10/keyedit.c:1778
+#: g10/g10.c:754 g10/keyedit.c:1764
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:821
+#: g10/g10.c:837
 msgid "usage: gpg [options] "
 msgstr "usage: gpg [options] "
 
-#: g10/g10.c:899
+#: g10/g10.c:940
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/g10.c:917
+#: g10/g10.c:958
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = sign found in group definition “%s”\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1155
 #, c-format
 msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe ownership on homedir “%s”\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1158
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
 
-#: g10/g10.c:1088
+#: g10/g10.c:1161
 #, c-format
 msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "WARNING: unsafe ownership on extension “%s”\n"
 
-#: g10/g10.c:1094
+#: g10/g10.c:1167
 #, c-format
 msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "WARNING: unsafe permissions on homedir “%s”\n"
 
-#: g10/g10.c:1097
+#: g10/g10.c:1170
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1173
 #, c-format
 msgid "WARNING: unsafe permissions on extension \"%s\"\n"
 msgstr "WARNING: unsafe permissions on extension “%s”\n"
 
-#: g10/g10.c:1106
+#: g10/g10.c:1179
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
 
-#: g10/g10.c:1109
+#: g10/g10.c:1182
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file “%s”\n"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1185
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory ownership on extension “%s”\n"
 
-#: g10/g10.c:1118
+#: g10/g10.c:1191
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
 
-#: g10/g10.c:1121
+#: g10/g10.c:1194
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -750,354 +750,363 @@ msgid ""
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file “%s”\n"
 
-#: g10/g10.c:1124
+#: g10/g10.c:1197
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory permissions on extension “%s”\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1323
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "unknown configuration item “%s”\n"
+
+#: g10/g10.c:1570
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: old default options file ‘%s’ ignored\n"
 
-#: g10/g10.c:1392
+#: g10/g10.c:1606
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: no default option file ‘%s’\n"
 
-#: g10/g10.c:1396
+#: g10/g10.c:1610
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "option file ‘%s’: %s\n"
 
-#: g10/g10.c:1403
+#: g10/g10.c:1617
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: g10/g10.c:1622 g10/g10.c:2101 g10/g10.c:2112
+#: g10/g10.c:1842 g10/g10.c:2333 g10/g10.c:2344
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s is not for normal use!\n"
 
-#: g10/g10.c:1635
+#: g10/g10.c:1855
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
 
-#: g10/g10.c:1845
+#: g10/g10.c:2066
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is not a valid character set\n"
 
-#: g10/g10.c:1863
+#: g10/g10.c:2084
 msgid "could not parse keyserver URI\n"
 msgstr "could not parse keyserver URI\n"
 
-#: g10/g10.c:1872
+#: g10/g10.c:2093
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/g10.c:1875
+#: g10/g10.c:2096
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/g10.c:1882
+#: g10/g10.c:2103
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/g10.c:1885
+#: g10/g10.c:2106
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/g10.c:1907
+#: g10/g10.c:2129
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/g10.c:1910
+#: g10/g10.c:2132
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/g10.c:1931
+#: g10/g10.c:2153
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:2156
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/g10.c:1941
+#: g10/g10.c:2163
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/g10.c:2090
+#: g10/g10.c:2322
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2326
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/g10.c:2103
+#: g10/g10.c:2335
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/g10.c:2106
+#: g10/g10.c:2338
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/g10.c:2127
+#: g10/g10.c:2359
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
 
-#: g10/g10.c:2133
+#: g10/g10.c:2365
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 
-#: g10/g10.c:2139
+#: g10/g10.c:2371
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 
-#: g10/g10.c:2152
+#: g10/g10.c:2384
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 
-#: g10/g10.c:2220 g10/g10.c:2244
+#: g10/g10.c:2452 g10/g10.c:2476
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/g10.c:2226 g10/g10.c:2250
+#: g10/g10.c:2458 g10/g10.c:2482
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: g10/g10.c:2232
+#: g10/g10.c:2464
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/g10.c:2238
+#: g10/g10.c:2470
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/g10.c:2253
+#: g10/g10.c:2485
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/g10.c:2255
+#: g10/g10.c:2487
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/g10.c:2257
-msgid "max-cert-depth must be in range 1 to 255\n"
-msgstr "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2489
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth must be in the range from 1 to 255\n"
+
+#: g10/g10.c:2491
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+
+#: g10/g10.c:2493
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/g10.c:2260
+#: g10/g10.c:2496
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/g10.c:2264
+#: g10/g10.c:2500
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/g10.c:2268
-msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "invalid default-check-level; must be 0, 1, 2, or 3\n"
-
-#: g10/g10.c:2274
+#: g10/g10.c:2507
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/g10.c:2282
+#: g10/g10.c:2516
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/g10.c:2286
+#: g10/g10.c:2520
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/g10.c:2290
+#: g10/g10.c:2524
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/g10.c:2323
+#: g10/g10.c:2557
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/g10.c:2367
+#: g10/g10.c:2604
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2372
+#: g10/g10.c:2609
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use digest algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2377
+#: g10/g10.c:2614
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use compression algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2465
+#: g10/g10.c:2702
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/g10.c:2475
+#: g10/g10.c:2713
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/g10.c:2485
+#: g10/g10.c:2724
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2492
+#: g10/g10.c:2731
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2504
+#: g10/g10.c:2743
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:2517
+#: g10/g10.c:2756
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filename]"
 
-#: g10/g10.c:2519
+#: g10/g10.c:2758
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2522
+#: g10/g10.c:2761
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2779
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2792
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:2568
+#: g10/g10.c:2807
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filename]"
 
-#: g10/g10.c:2570
+#: g10/g10.c:2809
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2812
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 
-#: g10/g10.c:2593
+#: g10/g10.c:2832
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2841
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:2627
+#: g10/g10.c:2866
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2874
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2643
+#: g10/g10.c:2878
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2651
+#: g10/g10.c:2882
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2659
+#: g10/g10.c:2886
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2667
+#: g10/g10.c:2910
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:2723 g10/encode.c:470 g10/sign.c:888
+#: g10/g10.c:2966 g10/encode.c:474 g10/sign.c:886
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "can't open %s: %s\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2981
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:2775
+#: g10/g10.c:3018
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:3020
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:3022
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:3033
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/g10.c:2800
+#: g10/g10.c:3043
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/g10.c:2841
+#: g10/g10.c:3084
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/g10.c:2849
+#: g10/g10.c:3092
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/g10.c:2936
+#: g10/g10.c:3179
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/g10.c:3052
+#: g10/g10.c:3302
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3056
+#: g10/g10.c:3306
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/g10.c:3059 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:3309 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "can't open ‘%s’\n"
 
-#: g10/g10.c:3333
+#: g10/g10.c:3583
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1105,23 +1114,23 @@ msgstr ""
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/g10.c:3342
+#: g10/g10.c:3592
 msgid "a user notation name must contain the '@' character\n"
 msgstr "a user notation name must contain the ‘@’ character\n"
 
-#: g10/g10.c:3352
+#: g10/g10.c:3602
 msgid "a notation value must not use any control characters\n"
 msgstr "a notation value must not use any control characters\n"
 
-#: g10/g10.c:3386
+#: g10/g10.c:3636
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/g10.c:3388
+#: g10/g10.c:3638
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/g10.c:3421
+#: g10/g10.c:3671
 msgid "the given signature preferred keyserver URL is invalid\n"
 msgstr "the given signature preferred keyserver URL is invalid\n"
 
@@ -1141,11 +1150,11 @@ msgstr "make timestamp conflicts only a warning"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:95
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Usage: gpgv [options] [files] (-h for help)"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:98
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1268,7 +1277,7 @@ msgstr ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:302 g10/mainproc.c:1477
+#: g10/pkclist.c:302 g10/mainproc.c:1508
 msgid "                aka \""
 msgstr "                aka \""
 
@@ -1404,78 +1413,86 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNING: Using untrusted key!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:619
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "WARNING: this key might be revoked (revocation key not present)\n"
+
+#: g10/pkclist.c:628
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "WARNING: This key has been revoked by its designated revoker!\n"
+
+#: g10/pkclist.c:631
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNING: This key has been revoked by its owner!\n"
 
-#: g10/pkclist.c:624
+#: g10/pkclist.c:632
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         This could mean that the signature is forgery.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:638
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNING: This subkey has been revoked by its owner!\n"
 
-#: g10/pkclist.c:635
+#: g10/pkclist.c:643
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: This key has been disabled.\n"
 
-#: g10/pkclist.c:640
+#: g10/pkclist.c:648
 msgid "Note: This key has expired!\n"
 msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:659
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:661
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:661
+#: g10/pkclist.c:669
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:670
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:670
+#: g10/pkclist.c:678
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:680
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:824 g10/pkclist.c:860 g10/encode.c:787
+#: g10/pkclist.c:832 g10/pkclist.c:868 g10/encode.c:791
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "you may not use %s while in %s mode\n"
 
-#: g10/pkclist.c:837 g10/pkclist.c:870 g10/pkclist.c:1039 g10/pkclist.c:1099
+#: g10/pkclist.c:845 g10/pkclist.c:878 g10/pkclist.c:1047 g10/pkclist.c:1107
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:847 g10/pkclist.c:1071
+#: g10/pkclist.c:855 g10/pkclist.c:1079
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:889
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:913
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:939
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1483,33 +1500,33 @@ msgstr ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 
-#: g10/pkclist.c:947
+#: g10/pkclist.c:955
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:952 g10/pkclist.c:1014
+#: g10/pkclist.c:960 g10/pkclist.c:1022
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:970
+#: g10/pkclist.c:978
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:977
+#: g10/pkclist.c:985
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:1006
+#: g10/pkclist.c:1014
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "unknown default recipient ‘%s’\n"
 
-#: g10/pkclist.c:1051
+#: g10/pkclist.c:1059
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:1106
+#: g10/pkclist.c:1114
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
@@ -1530,76 +1547,76 @@ msgstr "too many digest preferences\n"
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:304
+#: g10/keygen.c:312
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:632
+#: g10/keygen.c:637
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:671
+#: g10/keygen.c:676
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:715
+#: g10/keygen.c:720
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:769 g10/keygen.c:853 g10/keygen.c:944
+#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
+#: g10/keygen.c:779 g10/keygen.c:863 g10/keygen.c:954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1054
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1056
 #, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
-msgstr "   (%d) DSA and ElGamal (default)\n"
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA and Elgamal (default)\n"
 
-#: g10/keygen.c:1052
+#: g10/keygen.c:1057
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign only)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1059
 #, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (encrypt only)\n"
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (encrypt only)\n"
 
-#: g10/keygen.c:1055
+#: g10/keygen.c:1060
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sign only)\n"
 
-#: g10/keygen.c:1057
+#: g10/keygen.c:1062
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1064
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (sign and encrypt)\n"
 
-#: g10/keygen.c:1062 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
+#: g10/keygen.c:1067 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/keygen.c:1096 g10/keyedit.c:800 g10/revoke.c:637
+#: g10/keygen.c:1101 g10/keyedit.c:800 g10/revoke.c:637
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/keygen.c:1109
+#: g10/keygen.c:1114
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1612,28 +1629,28 @@ msgstr ""
 "              default keysize is 1024 bits\n"
 "    highest suggested keysize is 2048 bits\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1123
 msgid "What keysize do you want? (1024) "
 msgstr "What keysize do you want? (1024) "
 
-#: g10/keygen.c:1123
+#: g10/keygen.c:1128
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA only allows keysizes from 512 to 1024\n"
 
-#: g10/keygen.c:1125
+#: g10/keygen.c:1130
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1133
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize too small; 768 is smallest value allowed.\n"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1144
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize too large; %d is largest value allowed.\n"
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1149
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1641,11 +1658,11 @@ msgstr ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 
-#: g10/keygen.c:1147
+#: g10/keygen.c:1152
 msgid "Are you sure that you want this keysize? "
 msgstr "Are you sure that you want this keysize? "
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1153
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1653,17 +1670,17 @@ msgstr ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 
-#: g10/keygen.c:1157
+#: g10/keygen.c:1162
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:1160 g10/keygen.c:1164
+#: g10/keygen.c:1165 g10/keygen.c:1169
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/keygen.c:1215
+#: g10/keygen.c:1220
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1679,7 +1696,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:1224
+#: g10/keygen.c:1229
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1695,29 +1712,29 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:1246
+#: g10/keygen.c:1251
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:1248
+#: g10/keygen.c:1253
 msgid "Signature is valid for? (0) "
 msgstr "Signature is valid for? (0) "
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1258
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:1258
+#: g10/keygen.c:1263
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s does not expire at all\n"
 
-#: g10/keygen.c:1265
+#: g10/keygen.c:1270
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expires at %s\n"
 
-#: g10/keygen.c:1271
+#: g10/keygen.c:1276
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1725,11 +1742,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:1276
+#: g10/keygen.c:1281
 msgid "Is this correct (y/n)? "
 msgstr "Is this correct (y/n)? "
 
-#: g10/keygen.c:1319
+#: g10/keygen.c:1324
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1745,44 +1762,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1336
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1344
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:1341
+#: g10/keygen.c:1346
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:1343
+#: g10/keygen.c:1348
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:1351
+#: g10/keygen.c:1356
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:1362
+#: g10/keygen.c:1367
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:1370
+#: g10/keygen.c:1375
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1381
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:1399
+#: g10/keygen.c:1404
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:1405
+#: g10/keygen.c:1410
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1793,27 +1810,27 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1410
+#: g10/keygen.c:1415
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
-#: g10/keygen.c:1415
+#: g10/keygen.c:1420
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1425
+#: g10/keygen.c:1430
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:1426
+#: g10/keygen.c:1431
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1450
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:1484
+#: g10/keygen.c:1489
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1821,16 +1838,16 @@ msgstr ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 
-#: g10/keygen.c:1493 g10/keyedit.c:1005
+#: g10/keygen.c:1498 g10/keyedit.c:1005
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase not correctly repeated; try again"
 
-#: g10/keygen.c:1494
+#: g10/keygen.c:1499
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1500
+#: g10/keygen.c:1505
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1842,7 +1859,7 @@ msgstr ""
 "using this program with the option “--edit-key”.\n"
 "\n"
 
-#: g10/keygen.c:1521
+#: g10/keygen.c:1526
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1854,58 +1871,58 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:2079 g10/revoke.c:214 g10/revoke.c:414
+#: g10/keygen.c:2084 g10/revoke.c:214 g10/revoke.c:414
 msgid "sorry, can't do this in batch mode\n"
 msgstr "sorry, can't do this in batch mode\n"
 
-#: g10/keygen.c:2140
+#: g10/keygen.c:2145
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA keypair will have 1024 bits.\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2213
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:2316 g10/keygen.c:2441
+#: g10/keygen.c:2321 g10/keygen.c:2446
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:2318 g10/keygen.c:2444
+#: g10/keygen.c:2323 g10/keygen.c:2449
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "writing secret key stub to ‘%s’\n"
 
-#: g10/keygen.c:2321 g10/keygen.c:2447
+#: g10/keygen.c:2326 g10/keygen.c:2452
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "writing secret key to ‘%s’\n"
 
-#: g10/keygen.c:2430
+#: g10/keygen.c:2435
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:2436
+#: g10/keygen.c:2441
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "no writable secret keyring found: %s\n"
 
-#: g10/keygen.c:2454
+#: g10/keygen.c:2459
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error writing public keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2461
+#: g10/keygen.c:2466
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error writing secret keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2484
+#: g10/keygen.c:2489
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:2495
+#: g10/keygen.c:2500
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1913,34 +1930,34 @@ msgstr ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command “--edit-key” to generate a secondary key for this purpose.\n"
 
-#: g10/keygen.c:2507 g10/keygen.c:2618
+#: g10/keygen.c:2512 g10/keygen.c:2623
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:2553 g10/sign.c:290
+#: g10/keygen.c:2558 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2555 g10/sign.c:292
+#: g10/keygen.c:2560 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2564
+#: g10/keygen.c:2569
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:2593
+#: g10/keygen.c:2598
 msgid "Really create? "
 msgstr "Really create? "
 
-#: g10/decrypt.c:96 g10/encode.c:841
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
@@ -1950,7 +1967,7 @@ msgstr "--output doesn't work for this command\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: can't open: %s\n"
 
-#: g10/encode.c:203 g10/sign.c:1141
+#: g10/encode.c:203 g10/sign.c:1139
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
@@ -1959,443 +1976,479 @@ msgstr "error creating passphrase: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 
-#: g10/encode.c:227 g10/encode.c:540
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encode.c:297 g10/encode.c:586
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNING: empty file\n"
 
-#: g10/encode.c:461
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 
-#: g10/encode.c:476
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encode.c:512
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 
-#: g10/encode.c:522 g10/encode.c:717
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encode.c:630 g10/sign.c:860
+#: g10/encode.c:634 g10/sign.c:858
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
 
-#: g10/encode.c:814
+#: g10/encode.c:818
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s”\n"
 
-#: g10/export.c:162 g10/keyedit.c:2705 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:163 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "key ‘%s’ not found: %s\n"
 
-#: g10/export.c:184 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:435
+#: g10/export.c:185 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:435
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error reading keyblock: %s\n"
 
-#: g10/export.c:193
+#: g10/export.c:194
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "key %08lX: not a rfc2440 key - skipped\n"
 
-#: g10/export.c:209
+#: g10/export.c:210
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "key %08lX: not protected - skipped\n"
 
-#: g10/export.c:217
+#: g10/export.c:218
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "key %08lX: PGP 2.x style key - skipped\n"
 
-#: g10/export.c:362
+#: g10/export.c:363
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr "WARNING: secret key %08lX does not have a simple SK checksum\n"
 
-#: g10/export.c:394
+#: g10/export.c:395
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "too many entries in pk cache - disabled\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2631
+#: g10/getkey.c:186 g10/getkey.c:2646
 msgid "[User id not found]"
 msgstr "[User id not found]"
 
-#: g10/getkey.c:1598
+#: g10/getkey.c:1620
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2113
+#: g10/getkey.c:2128
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "no secret subkey for public subkey %08lX - ignoring\n"
 
-#: g10/getkey.c:2341
+#: g10/getkey.c:2356
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "using secondary key %08lX instead of primary key %08lX\n"
 
-#: g10/getkey.c:2388
+#: g10/getkey.c:2403
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "key %08lX: secret key without public key - skipped\n"
 
-#: g10/import.c:240
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "skipping block of type %d\n"
 
-#: g10/import.c:249
+#: g10/import.c:250
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu keys processed so far\n"
 
-#: g10/import.c:254
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error reading ‘%s’: %s\n"
 
-#: g10/import.c:266
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Total number processed: %lu\n"
 
-#: g10/import.c:268
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      skipped new keys: %lu\n"
 
-#: g10/import.c:271
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          w/o user IDs: %lu\n"
 
-#: g10/import.c:273
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "              imported: %lu"
 
-#: g10/import.c:279
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             unchanged: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          new user IDs: %lu\n"
 
-#: g10/import.c:283
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           new subkeys: %lu\n"
 
-#: g10/import.c:285
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        new signatures: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   new key revocations: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      secret keys read: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  secret keys imported: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " secret keys unchanged: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:296
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          not imported: %lu\n"
 
-#: g10/import.c:563
+#: g10/import.c:567 g10/import.c:581 g10/import.c:595
+#, c-format
+msgid "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
+msgstr "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
+
+#: g10/import.c:570
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr "         “%s”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:584
+#, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "         “%s”: preference for digest algorithm %s\n"
+
+#: g10/import.c:598
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr "         “%s”: preference for compression algorithm %s\n"
+
+#: g10/import.c:611
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr "it is strongly suggested that you update your preferences and\n"
+
+#: g10/import.c:613
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+"re-distribute this key to avoid potential algorithm mismatch problems\n"
+
+#: g10/import.c:637
 #, c-format
-msgid "key %08lX: Elgamal primary key - this may take some time to import\n"
-msgstr "key %08lX: Elgamal primary key - this may take some time to import\n"
+msgid ""
+"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
+msgstr ""
+"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
 
-#: g10/import.c:577 g10/import.c:895
+#: g10/import.c:682 g10/import.c:1026
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "key %08lX: no user ID\n"
 
-#: g10/import.c:597
+#: g10/import.c:702
 #, c-format
 msgid "key %08lX: PKS subkey corruption repaired\n"
 msgstr "key %08lX: PKS subkey corruption repaired\n"
 
-#: g10/import.c:612
+#: g10/import.c:717
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "key %08lX: accepted non self-signed user ID ‘%s’\n"
 
-#: g10/import.c:618
+#: g10/import.c:723
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "key %08lX: no valid user IDs\n"
 
-#: g10/import.c:620
+#: g10/import.c:725
 msgid "this may be caused by a missing self-signature\n"
 msgstr "this may be caused by a missing self-signature\n"
 
-#: g10/import.c:629 g10/import.c:988
+#: g10/import.c:734 g10/import.c:1133
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "key %08lX: public key not found: %s\n"
 
-#: g10/import.c:634
+#: g10/import.c:740
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "key %08lX: new key - skipped\n"
 
-#: g10/import.c:643
+#: g10/import.c:749
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:648 g10/sign.c:767 g10/sign.c:1003 g10/openfile.c:253
+#: g10/import.c:754 g10/sign.c:765 g10/sign.c:1001 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "writing to ‘%s’\n"
 
-#: g10/import.c:651 g10/import.c:737 g10/import.c:922 g10/import.c:1048
+#: g10/import.c:757 g10/import.c:843 g10/import.c:1055 g10/import.c:1193
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error writing keyring ‘%s’: %s\n"
 
-#: g10/import.c:669
+#: g10/import.c:775
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "key %08lX: public key “%s” imported\n"
 
-#: g10/import.c:691
+#: g10/import.c:797
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "key %08lX: doesn't match our copy\n"
 
-#: g10/import.c:708 g10/import.c:1005
+#: g10/import.c:814 g10/import.c:1150
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "key %08lX: can't locate original keyblock: %s\n"
 
-#: g10/import.c:715 g10/import.c:1011
+#: g10/import.c:821 g10/import.c:1156
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "key %08lX: can't read original keyblock: %s\n"
 
-#: g10/import.c:746
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "key %08lX: “%s” 1 new user ID\n"
 
-#: g10/import.c:749
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "key %08lX: “%s” %d new user IDs\n"
 
-#: g10/import.c:752
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "key %08lX: “%s” 1 new signature\n"
 
-#: g10/import.c:755
+#: g10/import.c:861
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "key %08lX: “%s” %d new signatures\n"
 
-#: g10/import.c:758
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "key %08lX: “%s” 1 new subkey\n"
 
-#: g10/import.c:761
+#: g10/import.c:867
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "key %08lX: “%s” %d new subkeys\n"
 
-#: g10/import.c:780
+#: g10/import.c:888
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "key %08lX: “%s” not changed\n"
 
-#: g10/import.c:901
+#: g10/import.c:1032
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "key %08lX: secret key with invalid cipher %d - skipped\n"
 
-#: g10/import.c:916
+#: g10/import.c:1049
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no default secret keyring: %s\n"
 
-#: g10/import.c:927
+#: g10/import.c:1060
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "key %08lX: secret key imported\n"
 
-#: g10/import.c:943
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "key %08lX: already in secret keyring\n"
 
-#: g10/import.c:953
+#: g10/import.c:1098
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "key %08lX: secret key not found: %s\n"
 
-#: g10/import.c:982
+#: g10/import.c:1127
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "key %08lX: no public key - can't apply revocation certificate\n"
 
-#: g10/import.c:1022
+#: g10/import.c:1167
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "key %08lX: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1199
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "key %08lX: “%s” revocation certificate imported\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1263
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "key %08lX: no user ID for signature\n"
 
-#: g10/import.c:1133
+#: g10/import.c:1278
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "key %08lX: unsupported public key algorithm on user id “%s”\n"
 
-#: g10/import.c:1135
+#: g10/import.c:1280
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "key %08lX: invalid self-signature on user id “%s”\n"
 
-#: g10/import.c:1152
+#: g10/import.c:1297
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "key %08lX: no subkey for key binding\n"
 
-#: g10/import.c:1161 g10/import.c:1205
+#: g10/import.c:1306 g10/import.c:1350
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "key %08lX: unsupported public key algorithm\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1307
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "key %08lX: invalid subkey binding\n"
 
-#: g10/import.c:1175
+#: g10/import.c:1320
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "key %08lX: removed multiple subkey binding\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1341
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "key %08lX: no subkey for key revocation\n"
 
-#: g10/import.c:1206
+#: g10/import.c:1351
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "key %08lX: invalid subkey revocation\n"
 
-#: g10/import.c:1219
+#: g10/import.c:1364
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "key %08lX: removed multiple subkey revocation\n"
 
-#: g10/import.c:1258
+#: g10/import.c:1403
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "key %08lX: skipped user ID '"
 
-#: g10/import.c:1281
+#: g10/import.c:1426
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "key %08lX: skipped subkey\n"
 
-#: g10/import.c:1308
+#: g10/import.c:1453
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "key %08lX: non exportable signature (class %02x) - skipped\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1462
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "key %08lX: revocation certificate at wrong place - skipped\n"
 
-#: g10/import.c:1334
+#: g10/import.c:1479
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "key %08lX: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:1347
+#: g10/import.c:1492
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "key %08lX: subkey signature in wrong place - skipped\n"
 
-#: g10/import.c:1355
+#: g10/import.c:1500
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 
-#: g10/import.c:1454
+#: g10/import.c:1599
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: duplicated user ID detected - merged\n"
 
-#: g10/import.c:1513
+#: g10/import.c:1658
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 
-#: g10/import.c:1527
+#: g10/import.c:1672
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 
-#: g10/import.c:1585
+#: g10/import.c:1730
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "key %08lX: “%s” revocation certificate added\n"
 
-#: g10/import.c:1618
+#: g10/import.c:1763
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "key %08lX: direct key signature added\n"
@@ -2474,12 +2527,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID “%s” is revoked."
 
 #: g10/keyedit.c:501 g10/keyedit.c:521 g10/keyedit.c:542 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1366
+#: g10/keyedit.c:750 g10/keyedit.c:1355
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
 #: g10/keyedit.c:509 g10/keyedit.c:529 g10/keyedit.c:550 g10/keyedit.c:698
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1361
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
@@ -2687,8 +2740,8 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Really sign? "
 
-#: g10/keyedit.c:906 g10/keyedit.c:3615 g10/keyedit.c:3706 g10/keyedit.c:3779
-#: g10/sign.c:370
+#: g10/keyedit.c:906 g10/keyedit.c:3610 g10/keyedit.c:3701 g10/keyedit.c:3774
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -2735,10 +2788,6 @@ msgid "moving a key signature to the correct place\n"
 msgstr "moving a key signature to the correct place\n"
 
 #: g10/keyedit.c:1122
-msgid "quit"
-msgstr "quit"
-
-#: g10/keyedit.c:1122
 msgid "quit this menu"
 msgstr "quit this menu"
 
@@ -3050,208 +3099,223 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "show photo ID"
 
-#: g10/keyedit.c:1187 g10/delkey.c:119
+#: g10/keyedit.c:1187 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "can't do that in batchmode\n"
 
-#: g10/keyedit.c:1225
+#: g10/keyedit.c:1218
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error reading secret keyblock ‘%s’: %s\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1235
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1267
 msgid "Command> "
 msgstr "Command> "
 
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1297
 msgid "Need the secret key to do this.\n"
 msgstr "Need the secret key to do this.\n"
 
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1301
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Please use the command “toggle” first.\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1349
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1368
 msgid "Really sign all user IDs? "
 msgstr "Really sign all user IDs? "
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1369
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Select the user IDs to sign\n"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1394
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/keyedit.c:1426 g10/keyedit.c:1447 g10/keyedit.c:1507
+#: g10/keyedit.c:1414 g10/keyedit.c:1435 g10/keyedit.c:1494
 msgid "You must select at least one user ID.\n"
 msgstr "You must select at least one user ID.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1416
 msgid "You can't delete the last user ID!\n"
 msgstr "You can't delete the last user ID!\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1419
 msgid "Really remove all selected user IDs? "
 msgstr "Really remove all selected user IDs? "
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1420
 msgid "Really remove this user ID? "
 msgstr "Really remove this user ID? "
 
-#: g10/keyedit.c:1470 g10/keyedit.c:1526
+#: g10/keyedit.c:1458 g10/keyedit.c:1513
 msgid "You must select at least one key.\n"
 msgstr "You must select at least one key.\n"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1461
 msgid "Do you really want to delete the selected keys? "
 msgstr "Do you really want to delete the selected keys? "
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1462
 msgid "Do you really want to delete this key? "
 msgstr "Do you really want to delete this key? "
 
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1497
 msgid "Really revoke all selected user IDs? "
 msgstr "Really revoke all selected user IDs? "
 
-#: g10/keyedit.c:1511
+#: g10/keyedit.c:1498
 msgid "Really revoke this user ID? "
 msgstr "Really revoke this user ID? "
 
-#: g10/keyedit.c:1530
+#: g10/keyedit.c:1517
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Do you really want to revoke the selected keys? "
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1518
 msgid "Do you really want to revoke this key? "
 msgstr "Do you really want to revoke this key? "
 
-#: g10/keyedit.c:1570
+#: g10/keyedit.c:1557
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Owner trust may not be set while using an user provided trust database\n"
 
-#: g10/keyedit.c:1602
-msgid "Current preference list:\n"
-msgstr "Current preference list:\n"
+#: g10/keyedit.c:1589
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:1608
+#: g10/keyedit.c:1595
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Really update the preferences for the selected user IDs? "
 
-#: g10/keyedit.c:1610
+#: g10/keyedit.c:1597
 msgid "Really update the preferences? "
 msgstr "Really update the preferences? "
 
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1643
 msgid "Save changes? "
 msgstr "Save changes? "
 
-#: g10/keyedit.c:1659
+#: g10/keyedit.c:1646
 msgid "Quit without saving? "
 msgstr "Quit without saving? "
 
-#: g10/keyedit.c:1670
+#: g10/keyedit.c:1656
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1663
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "update secret failed: %s\n"
 
-#: g10/keyedit.c:1684
+#: g10/keyedit.c:1670
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1682
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help”)\n"
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1741
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1793
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1804
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2061
+#: g10/keyedit.c:2044
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "This key may be revoked by %s key "
 
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2048
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2082
+#: g10/keyedit.c:2065
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:2068
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:2070
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:2072
 #, c-format
-msgid "created: %s expires: %s"
-msgstr "created: %s expires: %s"
+msgid "expires: %s"
+msgstr "expires: %s"
 
-#: g10/keyedit.c:2097
+#: g10/keyedit.c:2089
 #, c-format
-msgid "trust: %-13s"
-msgstr "trust: %-13s"
+msgid "trust: %s"
+msgstr "trust: %s"
 
-#: g10/keyedit.c:2098
+#: g10/keyedit.c:2093
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:2105
+#: g10/keyedit.c:2100
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
+#: g10/keyedit.c:2114 g10/keyedit.c:2217 g10/keyedit.c:2232
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  created: %s expires: %s"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2130
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey has been revoked: %s\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2133
 msgid "rev- faked revocation found\n"
 msgstr "rev- faked revocation found\n"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2135
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem checking revocation: %s\n"
 
-#: g10/keyedit.c:2165 g10/mainproc.c:1485 g10/trustdb.c:1166
+#: g10/keyedit.c:2160 g10/keylist.c:709 g10/mainproc.c:1516 g10/trustdb.c:1123
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:2167 g10/mainproc.c:1487 g10/trustdb.c:500
+#: g10/keyedit.c:2162 g10/keylist.c:709 g10/mainproc.c:1518 g10/trustdb.c:500
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:2188
+#: g10/keyedit.c:2183
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:2196
+#: g10/keyedit.c:2191
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3259,7 +3323,15 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2256 g10/mainproc.c:924
+msgid "[revoked] "
+msgstr "[revoked] "
+
+#: g10/keyedit.c:2258
+msgid "[expired] "
+msgstr "[expired] "
+
+#: g10/keyedit.c:2323
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3267,7 +3339,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2387
+#: g10/keyedit.c:2382
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3277,45 +3349,45 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2392 g10/keyedit.c:2665
+#: g10/keyedit.c:2387 g10/keyedit.c:2660
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:2398
+#: g10/keyedit.c:2393
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:2533
+#: g10/keyedit.c:2528
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:2543
+#: g10/keyedit.c:2538
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:2547
+#: g10/keyedit.c:2542
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:2553
+#: g10/keyedit.c:2548
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:2567
+#: g10/keyedit.c:2562
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Deleted %d signature.\n"
 
-#: g10/keyedit.c:2568
+#: g10/keyedit.c:2563
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2566
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2655
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3325,88 +3397,88 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2666
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:2694
+#: g10/keyedit.c:2689
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:2715
+#: g10/keyedit.c:2710
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:2725
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2747
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2776
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:2787
+#: g10/keyedit.c:2782
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 
-#: g10/keyedit.c:2848
+#: g10/keyedit.c:2843
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Please remove selections from the secret keys.\n"
 
-#: g10/keyedit.c:2854
+#: g10/keyedit.c:2849
 msgid "Please select at most one secondary key.\n"
 msgstr "Please select at most one secondary key.\n"
 
-#: g10/keyedit.c:2858
+#: g10/keyedit.c:2853
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changing expiration time for a secondary key.\n"
 
-#: g10/keyedit.c:2860
+#: g10/keyedit.c:2855
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2900
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:2921
+#: g10/keyedit.c:2916
 msgid "No corresponding signature in secret ring\n"
 msgstr "No corresponding signature in secret ring\n"
 
-#: g10/keyedit.c:3001
+#: g10/keyedit.c:2996
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:3038 g10/keyedit.c:3147 g10/keyedit.c:3239
+#: g10/keyedit.c:3033 g10/keyedit.c:3142 g10/keyedit.c:3234
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "skipping v3 self-signature on user id “%s”\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3198
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3296
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:3347
+#: g10/keyedit.c:3342
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No secondary key with index %d\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3456
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3466
+#: g10/keyedit.c:3461
 #, c-format
 msgid ""
 "\"\n"
@@ -3415,7 +3487,7 @@ msgstr ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3464
 #, c-format
 msgid ""
 "\"\n"
@@ -3424,65 +3496,65 @@ msgstr ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3469
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:3478
+#: g10/keyedit.c:3473
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3477
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:3507
+#: g10/keyedit.c:3502
 msgid "You have signed these user IDs:\n"
 msgstr "You have signed these user IDs:\n"
 
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3521
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signed by %08lX at %s%s%s\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3529
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revoked by %08lX at %s\n"
 
-#: g10/keyedit.c:3554
+#: g10/keyedit.c:3549
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:3564
+#: g10/keyedit.c:3559
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signed by %08lX at %s%s\n"
 
-#: g10/keyedit.c:3566
+#: g10/keyedit.c:3561
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3568
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3598
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:3673
+#: g10/keyedit.c:3668
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3685
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:3863
+#: g10/keyedit.c:3858
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
@@ -3523,285 +3595,295 @@ msgstr "not human readable"
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:636 g10/keylist.c:666 g10/keylist.c:754 g10/keylist.c:783
-#: g10/mainproc.c:895
+#: g10/keylist.c:638 g10/keylist.c:674 g10/keylist.c:776 g10/keylist.c:805
+#: g10/mainproc.c:926
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expires: %s]"
 
-#: g10/keylist.c:1381
+#: g10/keylist.c:670 g10/keylist.c:772
+#, c-format
+msgid " [revoked: %s]"
+msgstr " [revoked: %s]"
+
+#: g10/keylist.c:672 g10/keylist.c:774
+#, c-format
+msgid " [expired: %s]"
+msgstr " [expired: %s]"
+
+#: g10/keylist.c:1393
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:1383
+#: g10/keylist.c:1395
 msgid "     Subkey fingerprint:"
 msgstr "     Subkey fingerprint:"
 
-#: g10/keylist.c:1390
+#: g10/keylist.c:1402
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:1392
+#: g10/keylist.c:1404
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:1396 g10/keylist.c:1400
+#: g10/keylist.c:1408 g10/keylist.c:1412
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "weird size for an encrypted session key (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 msgstr "bad passphrase or unknown cipher algorithm (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s encrypted session key\n"
 
-#: g10/mainproc.c:302 g10/encr-data.c:66
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s encrypted data\n"
 
-#: g10/mainproc.c:306 g10/encr-data.c:68
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/mainproc.c:352
+#: g10/mainproc.c:366
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "public key is %08lX\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:421
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:454
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encrypted with %s key, ID %08lX\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:490
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:506 g10/mainproc.c:525
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:513
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:543
+#: g10/mainproc.c:562
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:547
+#: g10/mainproc.c:566
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:550
+#: g10/mainproc.c:579
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:556
+#: g10/mainproc.c:585
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:575
+#: g10/mainproc.c:605
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:577
+#: g10/mainproc.c:607
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:749
+#: g10/mainproc.c:779
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1248
+#: g10/mainproc.c:1279
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1290 g10/mainproc.c:1300
+#: g10/mainproc.c:1321 g10/mainproc.c:1331
 msgid "can't handle these multiple signatures\n"
 msgstr "can't handle these multiple signatures\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1342
 #, c-format
 msgid "Signature made %.*s\n"
 msgstr "Signature made %.*s\n"
 
-#: g10/mainproc.c:1312
+#: g10/mainproc.c:1343
 #, c-format
 msgid "               using %s key %08lX%08lX\n"
 msgstr "               using %s key %08lX%08lX\n"
 
-#: g10/mainproc.c:1316
+#: g10/mainproc.c:1347
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature made %.*s using %s key ID %08lX\n"
 
-#: g10/mainproc.c:1341
+#: g10/mainproc.c:1372
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:1404 g10/mainproc.c:1440
+#: g10/mainproc.c:1435 g10/mainproc.c:1471
 msgid "BAD signature from \""
 msgstr "BAD signature from \""
 
-#: g10/mainproc.c:1405 g10/mainproc.c:1441
+#: g10/mainproc.c:1436 g10/mainproc.c:1472
 msgid "Expired signature from \""
 msgstr "Expired signature from \""
 
-#: g10/mainproc.c:1406 g10/mainproc.c:1442
+#: g10/mainproc.c:1437 g10/mainproc.c:1473
 msgid "Good signature from \""
 msgstr "Good signature from \""
 
-#: g10/mainproc.c:1444
+#: g10/mainproc.c:1475
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1570
+#: g10/mainproc.c:1601
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1606
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:1578
+#: g10/mainproc.c:1609
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, digest algorithm %s\n"
 
-#: g10/mainproc.c:1579
+#: g10/mainproc.c:1610
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1611
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:1580 g10/trustdb.c:499
+#: g10/mainproc.c:1611 g10/trustdb.c:499
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:1600
+#: g10/mainproc.c:1631
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:1669 g10/mainproc.c:1685 g10/mainproc.c:1771
+#: g10/mainproc.c:1699 g10/mainproc.c:1715 g10/mainproc.c:1801
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:1712
+#: g10/mainproc.c:1742
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:1720
+#: g10/mainproc.c:1750
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:1777
+#: g10/mainproc.c:1807
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
 
-#: g10/mainproc.c:1787
+#: g10/mainproc.c:1817
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "invalid root packet detected in proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "can't disable core dumps: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimental algorithms should not be used!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "this cipher algorithm is deprecated; please use a more standard one!\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "the IDEA cipher plugin is not present\n"
 
-#: g10/misc.c:302
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 
-#: g10/misc.c:535
+#: g10/misc.c:491
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s”\n"
 
-#: g10/misc.c:539
+#: g10/misc.c:495
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s” is a deprecated option\n"
 
-#: g10/misc.c:541
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "please use “%s%s” instead\n"
 
-#: g10/misc.c:552
+#: g10/misc.c:508
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
-#: g10/misc.c:577
+#: g10/misc.c:533
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:687
+#: g10/misc.c:643
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:725
+#: g10/misc.c:742
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:741
+#: g10/misc.c:767
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "unknown option ‘%s’\n"
@@ -3926,32 +4008,32 @@ msgstr "%u-bit %s key, ID %08lX, created %s"
 msgid "Repeat passphrase: "
 msgstr "Repeat passphrase: "
 
-#: g10/plaintext.c:70
+#: g10/plaintext.c:72
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data not saved; use option “--output” to save it\n"
 
-#: g10/plaintext.c:112 g10/plaintext.c:127
+#: g10/plaintext.c:114 g10/plaintext.c:132
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creating ‘%s’: %s\n"
 
-#: g10/plaintext.c:369
+#: g10/plaintext.c:420
 msgid "Detached signature.\n"
 msgstr "Detached signature.\n"
 
-#: g10/plaintext.c:373
+#: g10/plaintext.c:424
 msgid "Please enter name of data file: "
 msgstr "Please enter name of data file: "
 
-#: g10/plaintext.c:394
+#: g10/plaintext.c:445
 msgid "reading stdin ...\n"
 msgstr "reading stdin ...\n"
 
-#: g10/plaintext.c:428
+#: g10/plaintext.c:479
 msgid "no signed data\n"
 msgstr "no signed data\n"
 
-#: g10/plaintext.c:436
+#: g10/plaintext.c:487
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "can't open signed data ‘%s’\n"
@@ -3997,47 +4079,47 @@ msgstr "secret key parts are not available\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protection algorithm %d%s is not supported\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:244
 msgid "Invalid passphrase; please try again"
 msgstr "Invalid passphrase; please try again"
 
-#: g10/seckey-cert.c:247
+#: g10/seckey-cert.c:245
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:307
+#: g10/seckey-cert.c:305
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "WARNING: Weak key detected - please change passphrase again.\n"
 
-#: g10/seckey-cert.c:345
+#: g10/seckey-cert.c:343
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
 
-#: g10/sig-check.c:70
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature digest conflict in message\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:146
 #, c-format
 msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
 "signatures!\n"
 msgstr ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
 "signatures!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:155
 #, c-format
 msgid "public key %08lX is %lu second newer than the signature\n"
 msgstr "public key %08lX is %lu second newer than the signature\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:156
 #, c-format
 msgid "public key %08lX is %lu seconds newer than the signature\n"
 msgstr "public key %08lX is %lu seconds newer than the signature\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:165
 #, c-format
 msgid ""
 "key %08lX has been created %lu second in future (time warp or clock "
@@ -4046,7 +4128,7 @@ msgstr ""
 "key %08lX has been created %lu second in future (time warp or clock "
 "problem)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:167
 #, c-format
 msgid ""
 "key %08lX has been created %lu seconds in future (time warp or clock "
@@ -4055,22 +4137,22 @@ msgstr ""
 "key %08lX has been created %lu seconds in future (time warp or clock "
 "problem)\n"
 
-#: g10/sig-check.c:249
+#: g10/sig-check.c:180
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTE: signature key %08lX expired %s\n"
 
-#: g10/sig-check.c:352
+#: g10/sig-check.c:263
 #, c-format
 msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
 msgstr "assuming bad signature from key %08lX due to an unknown critical bit\n"
 
-#: g10/sig-check.c:568
+#: g10/sig-check.c:486
 #, c-format
 msgid "key %08lX: no subkey for subkey revocation signature\n"
 msgstr "key %08lX: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:594
+#: g10/sig-check.c:512
 #, c-format
 msgid "key %08lX: no subkey for subkey binding signature\n"
 msgstr "key %08lX: no subkey for subkey binding signature\n"
@@ -4113,45 +4195,45 @@ msgstr ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 
-#: g10/sign.c:365
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
 
-#: g10/sign.c:374
+#: g10/sign.c:373
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:550
+#: g10/sign.c:548
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/sign.c:738
+#: g10/sign.c:736
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:762 g10/sign.c:998
+#: g10/sign.c:760 g10/sign.c:996
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "can't create %s: %s\n"
 
-#: g10/sign.c:791
+#: g10/sign.c:789
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n"
 
-#: g10/sign.c:883
+#: g10/sign.c:881
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:982
+#: g10/sign.c:980
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:1135
+#: g10/sign.c:1133
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s encryption will be used\n"
@@ -4166,12 +4248,12 @@ msgstr "can't handle text lines longer than %d characters\n"
 msgid "input line longer than %d characters\n"
 msgstr "input line longer than %d characters\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1435
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1442
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -4200,7 +4282,7 @@ msgstr "%s: can't create lock\n"
 msgid "%s: can't make lock\n"
 msgstr "%s: can't make lock\n"
 
-#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1470
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: can't create: %s\n"
@@ -4240,7 +4322,7 @@ msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
 #: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
-#: g10/tdbio.c:745 g10/tdbio.c:1368 g10/tdbio.c:1395
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
@@ -4250,52 +4332,52 @@ msgstr "%s: error reading version record: %s\n"
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1164
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1172
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1193
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1211
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1216
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1449
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1494
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "the trustdb is corrupted; please run “gpg --fix-trustdb”.\n"
 
@@ -4378,7 +4460,7 @@ msgstr "ultimate"
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2152
+#: g10/trustdb.c:551 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -4393,46 +4475,46 @@ msgstr "no need for a trustdb check with “%s” trust model\n"
 msgid "no need for a trustdb update with \"%s\" trust model\n"
 msgstr "no need for a trustdb update with “%s” trust model\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1264
+#: g10/trustdb.c:793 g10/trustdb.c:1221
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "public key %08lX not found: %s\n"
 
-#: g10/trustdb.c:1031
+#: g10/trustdb.c:988
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1035
+#: g10/trustdb.c:992
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:1903
+#: g10/trustdb.c:1847
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d keys processed (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:1956
+#: g10/trustdb.c:1911
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:1974
+#: g10/trustdb.c:1925
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "public key of ultimately trusted key %08lX not found\n"
 
-#: g10/trustdb.c:1997
+#: g10/trustdb.c:1948
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 
-#: g10/trustdb.c:2083
+#: g10/trustdb.c:2034
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2109
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
@@ -4473,10 +4555,10 @@ msgstr "skipped: secret key already present\n"
 #: g10/skclist.c:179
 #, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"skipped ‘%s’: this is a PGP generated ElGamal key which is not secure for "
+"skipped ‘%s’: this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 
 #: g10/openfile.c:84
@@ -4549,41 +4631,41 @@ msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA requires the use of a 160 bit hash algorithm\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(unless you specify the key by fingerprint)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "can't do that in batchmode without “--yes”\n"
 
-#: g10/delkey.c:138
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Delete this key from the keyring? "
 
-#: g10/delkey.c:146
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "This is a secret key! - really delete? "
 
-#: g10/delkey.c:156
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "deleting keyblock failed: %s\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "ownertrust information cleared\n"
 
-#: g10/delkey.c:194
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "there is a secret key for public key “%s”!\n"
 
-#: g10/delkey.c:196
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use option “--delete-secret-keys” to delete it first.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4593,7 +4675,7 @@ msgstr ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4605,69 +4687,45 @@ msgstr ""
 "access to the secret key.  Answer “yes” to set this key to\n"
 "ultimately trusted\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "If you want to use this revoked key anyway, answer “yes”."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "If you want to use this untrusted key anyway, answer “yes”."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Enter the user ID of the addressee to whom you want to send the message."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
-msgstr ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -4677,16 +4735,16 @@ msgstr ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Enter the size of the key"
 
-#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
-#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Answer “yes” or “no”"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4698,19 +4756,19 @@ msgstr ""
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Enter the name of the key holder"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "please enter an optional but highly suggested email address"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Please enter an optional comment"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4724,11 +4782,11 @@ msgstr ""
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Answer “yes” (or just “y”) if it is okay to generate the sub key."
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -4803,11 +4861,11 @@ msgstr ""
 "\n"
 "If you don't know what the right answer is, answer “0”."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Answer “yes” is you want to sign ALL the user IDs"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4815,11 +4873,11 @@ msgstr ""
 "Answer “yes” if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Answer “yes” if it is okay to delete the subkey"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -4829,7 +4887,7 @@ msgstr ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4841,7 +4899,7 @@ msgstr ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4849,7 +4907,7 @@ msgstr ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -4863,7 +4921,7 @@ msgstr ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -4873,23 +4931,23 @@ msgstr ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Please enter the passhrase; this is a secret sentence \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Please repeat the last passphrase, so you are sure what you typed in."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "Give the name of the file to which the signature applies"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Answer “yes” if it is okay to overwrite the file"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4897,7 +4955,7 @@ msgstr ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4925,7 +4983,7 @@ msgstr ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4935,11 +4993,11 @@ msgstr ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "No help available"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No help available for ‘%s’"
@@ -4979,25 +5037,26 @@ msgstr "Please fix this possible security flaw\n"
 
 #: g10/keyring.c:1360
 #, c-format
-msgid "checking keyring `%s'\n"
-msgstr "checking keyring ‘%s’\n"
+msgid "caching keyring `%s'\n"
+msgstr "caching keyring ‘%s’\n"
 
-#: g10/keyring.c:1398
+#: g10/keyring.c:1406
 #, c-format
-msgid "%lu keys checked so far (%lu signatures)\n"
-msgstr "%lu keys checked so far (%lu signatures)\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu keys cached so far (%lu signatures)\n"
 
-#: g10/keyring.c:1409
+#: g10/keyring.c:1418
 #, c-format
-msgid "%lu keys checked (%lu signatures)\n"
-msgstr "%lu keys checked (%lu signatures)\n"
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu keys cached (%lu signatures)\n"
 
-#: g10/keyring.c:1475
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring created\n"
 
 #: g10/photoid.c:65
+#, c-format
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5089,7 +5148,7 @@ msgstr "WARNING: unable to remove tempfile (%s) ‘%s’: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNING: unable to remove temp directory ‘%s’: %s\n"
 
-#: g10/keyid.c:332 g10/keyid.c:344 g10/keyid.c:356
+#: g10/keyid.c:370 g10/keyid.c:382 g10/keyid.c:394 g10/keyid.c:406
 msgid "never     "
 msgstr "never     "
 
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 3728538e9..98462cd09 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -71,7 +71,7 @@ if test "$1" = "--build-w32"; then
     [ $DIE = yes ] && exit 1
 
     $tsdir/configure --build=${build} --host=${host} \
-                ${disable_foo_tests} $*
+                ${disable_foo_tests} --disable-keyserver-helpers $*
 
     # Ugly hack to overcome a gettext problem.  Someone should look into
     # gettext to figure out why the po directory is not ignored as it used