About to release 1.3.2V1-3-2

9 files changed, 1771 insertions, 1051 deletions

diff --git a/ChangeLog b/ChangeLog
index 04fd3875c..4f0ded837 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-27  Werner Koch  <[email protected]>
+
+	Released 1.3.2.
+
 2003-05-26  David Shaw  <[email protected]>
 
 	* NEWS: Document --gnupg and the deprecation of --no-openpgp and
diff --git a/NEWS b/NEWS
index d386410cc..4a36628b4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.3.2 (unreleased)
+Noteworthy changes in version 1.3.2 (2003-05-27)
 ------------------------------------------------
 
     * New "--gnupg" option (set by default) that disables --openpgp,
diff --git a/checks/ChangeLog b/checks/ChangeLog
index 55aa0481a..a3067b4ab 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-27  Werner Koch  <[email protected]>
+
+	* Makefile.am (CLEANFILES): Add gpg.conf
+
 2003-05-26  David Shaw  <[email protected]>
 
 	* defs.inc (pgmname): Make sure there is a valid options
diff --git a/checks/Makefile.am b/checks/Makefile.am
index e9ecae736..1aacd4856 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -43,7 +43,7 @@ EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \
 	     mkdemodirs signdemokey
 CLEANFILES = prepared.stamp x y yy z out err  $(DATA_FILES) \
 	     plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
-	     *.test.log gpg_dearmor \
+	     *.test.log gpg_dearmor gpg.conf \
 	     pubring.gpg secring.gpg pubring.pkr secring.skr
 DISTCLEANFILES = pubring.gpg~ random_seed
 
diff --git a/configure.ac b/configure.ac
index 1760544f8..de90bab68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_PREREQ(2.52)
 
 # 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.2-cvs, [email protected])
+AC_INIT(gnupg, 1.3.2, [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/doc/gpg.sgml b/doc/gpg.sgml
index bf8351366..cf35d4d62 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1266,7 +1266,7 @@ Same as --keyring but for the secret keyrings.
 
 <varlistentry>
 <term>--primary-keyring &ParmFile;</term>
-<listitem<para>
+<listitem><para>
 Designate &ParmFile; as the primary public keyring.  This means that
 newly imported keys (via --import or keyserver --recv-from) will go to
 this keyring.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 88cf053f1..038c5dbf1 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -18,7 +18,7 @@
 @end menu
 
 @majorheading Name
-gpg ---- encryption and signing tool
+gpg ---- encryption and signing tool</>
 
 @majorheading Synopsis
 
@@ -51,8 +51,9 @@ Make a detached signature.
 Encrypt data. This option may be combined with ---sign.
 
 @item -c, ---symmetric
-Encrypt with symmetric cipher only.
-This command asks for a passphrase.
+Encrypt with a symmetric cipher using a passphrase. The default
+symmetric cipher used is CAST5, but may be chosen with the
+---cipher-algo option.
 
 @item ---store
 Store only (make a simple RFC1991 packet).
@@ -104,8 +105,10 @@ List all keys from the public keyrings, or just the
 ones given on the command line.
 
 @item ---list-secret-keys @code{names}
-List all keys from the secret keyrings, or just the
-ones given on the command line.
+List all keys from the secret keyrings, or just the ones given on the
+command line. A '#' after the letters 'sec' means that the secret key
+is not usable (for example, if it was created via
+---export-secret-subkeys).
 
 @item ---list-sigs @code{names}
 Same as ---list-keys, but the signatures are listed too.
@@ -163,11 +166,16 @@ Combines the functionality of nrsign and lsign to make a signature
 that is both non-revocable and
 non-exportable.
 
+@item tsign
+Make a trust signature. This is a signature that combines the notions
+of certification (like a regular signature), and trust (like the
+"trust" command). It is generally only useful in distinct communities
+or groups.
+
 @item revsig
-Revoke a signature. GnuPG asks for every
-signature which has been done by one of
-the secret keys, whether a revocation
-certificate should be generated.
+Revoke a signature. For every signature which has been generated by
+one of the secret keys, GnuPG asks whether a revocation certificate
+should be generated.
 
 @item trust
 Change the owner trust value. This updates the
@@ -175,18 +183,22 @@ trust-db immediately and no save is required.
 
 @item disable
 @itemx enable
-Disable or enable an entire key. A disabled key can normally not be used
-for encryption.
+Disable or enable an entire key. A disabled key can not normally be
+used for encryption.
 
 @item adduid
 Create an alternate user id.
 
 @item addphoto
-Create a photographic user id.
+Create a photographic user id. This will prompt for a JPEG file that
+will be embedded into the user ID.
 
 @item deluid
 Delete a user id.
 
+@item revuid
+Revoke a user id.
+
 @item addkey
 Add a subkey to this key.
 
@@ -203,10 +215,9 @@ export-options).
 Revoke a subkey.
 
 @item expire
-Change the key expiration time. If a key is
-selected, the time of this key will be changed.
-With no selection the key expiration of the
-primary key is changed.
+Change the key expiration time. If a subkey is selected, the
+expiration time of this subkey will be changed. With no selection,
+the key expiration of the primary key is changed.
 
 @item passwd
 Change the passphrase of the secret key.
@@ -248,7 +259,7 @@ are not already included in the preference list.
 Set the list of user ID preferences to @code{string}, this should be a
 string similar to the one printed by "pref". Using an empty string
 will set the default preference string, using "none" will set the
-preferences to nil. Use "gpg -v ---version" to get a list of available
+preferences to nil. Use "gpg ---version" to get a list of available
 algorithms. This command just initializes an internal list and does
 not change anything unless another command (such as "updpref") which
 changes the self-signatures is used.
@@ -337,7 +348,7 @@ a subkey or a signature, use the ---edit command.
 
 @item ---desig-revoke
 Generate a designated revocation certificate for a key. This allows a
-user (with the permission of the keyholder) to revoke someone elses
+user (with the permission of the keyholder) to revoke someone else's
 key.
 
 @item ---export @code{names}
@@ -383,35 +394,42 @@ but does only the merging of new signatures, user-IDs and subkeys.
 Import the keys with the given key IDs from a keyserver. Option
 ---keyserver must be used to give the name of this keyserver.
 
+@item ---refresh-keys @code{key IDs}
+Request updates from a keyserver for keys that already exist on the
+local keyring. This is useful for updating a key with the latest
+signatures, user IDs, etc. Option ---keyserver must be used to give
+the name of this keyserver.
+
 @item ---search-keys @code{names}
 Search the keyserver for the given names. Multiple names given here
 will be joined together to create the search string for the keyserver.
 Option ---keyserver must be used to give the name of this keyserver.
 
 @item ---update-trustdb
-Do trust DB maintenance. This command goes over all keys and builds
-the Web-of-Trust. This is an interactive command because it may has to
-ask for the "ownertrust" values of keys. The user has to give an
-estimation in how far she trusts the owner of the displayed key to
-correctly certify (sign) other keys. It does only ask for that value
-if it has not yet been assigned to a key. Using the edit menu, that
-value can be changed at any time later.
+Do trust database maintenance. This command iterates over all keys
+and builds the Web-of-Trust. This is an interactive command because it
+may have to ask for the "ownertrust" values for keys. The user has to
+give an estimation of how far she trusts the owner of the displayed
+key to correctly certify (sign) other keys. GnuPG only asks for the
+ownertrust value if it has not yet been assigned to a key. Using the
+---edit-key menu, the assigned value can be changed at any time.
 
 @item ---check-trustdb
-Do trust DB maintenance without user interaction. Form time to time
-the trust database must be updated so that expired keys and resulting
-changes in the Web-of-Trust can be tracked. GnuPG tries to figure
-when this is required and then does it implicitly; this command can be
-used to force such a check. The processing is identically to that of
----update-trustdb but it skips keys with a not yet defined "ownertrust".
+Do trust database maintenance without user interaction. From time to
+time the trust database must be updated so that expired keys or
+signatures and the resulting changes in the Web-of-Trust can be
+tracked. Normally, GnuPG will calculate when this is required and do
+it automatically unless ---no-auto-check-trustdb is set. This command
+can be used to force a trust database check at any time. The
+processing is identical to that of ---update-trustdb but it skips keys
+with a not yet defined "ownertrust".
 
 For use with cron jobs, this command can be used together with ---batch
-in which case the check is only done when it is due. To force a run
-even in batch mode add the option ---yes.
+in which case the trust database check is done only if a check is
+needed. To force a run even in batch mode add the option ---yes.
 
-@item ---export-ownertrust @code{file}
-Store the ownertrust values into
-@code{file} (or stdin if not given). This is useful for backup
+@item ---export-ownertrust
+Send the ownertrust values to stdout. This is useful for backup
 purposes as these values are the only ones which can't be re-created
 from a corrupted trust DB.
 
@@ -420,6 +438,11 @@ Update the trustdb with the ownertrust values stored
 in @code{files} (or stdin if not given); existing
 values will be overwritten.
 
+@item ---rebuild-keydb-caches
+When updating from version 1.0.6 to 1.0.7 this command should be used
+to create signature caches in the keyring. It might be handy in other
+situations too.
+
 @item ---print-md @code{algo} @code{files}
 @itemx ---print-mds @code{files}
 Print message digest of algorithm ALGO for all given files or stdin.
@@ -443,8 +466,8 @@ of supported algorithms.
 Print warranty information.
 
 @item -h, ---help
-Print usage information. This is a really long list even though it doesn't list
-all options.
+Print usage information. This is a really long list even though it
+doesn't list all options. For every option, consult this manual.
 
 @end table
 
@@ -455,7 +478,8 @@ Long options can be put in an options file (default
 not write the 2 dashes, but simply the name of the option and any
 required arguments. Lines with a hash ('#') as the first
 non-white-space character are ignored. Commands may be put in this
-file too, but that does not make sense.
+file too, but that is not generally useful as the command will execute
+automatically with every execution of gpg.
 
 @code{gpg} recognizes these options:
 
@@ -466,6 +490,15 @@ Create ASCII armored output.
 @item -o, ---output @code{file}
 Write output to @code{file}.
 
+@item ---mangle-dos-filenames
+@itemx ---no-mangle-dos-filenames
+The Windows version of GnuPG replaces the extension of an output
+filename to avoid problems with filenames containing more than one
+dot. This is not necessary for newer Windows versions and so
+---no-mangle-dos-filenames can be used to switch this feature off and
+have GnuPG append the new extension. This option has no effect on
+non-Windows platforms.
+
 @item -u, ---local-user @code{name}
 Use @code{name} as the user ID to sign.
 This option is silently ignored for the list commands,
@@ -478,8 +511,17 @@ found in the secret keyring.
 
 @item -r, ---recipient @code{name}
 @itemx 
-Encrypt for user id @code{name}. If this option is not
-specified, GnuPG asks for the user-id unless ---default-recipient is given
+Encrypt for user id @code{name}. If this option or ---hidden-recipient
+is not specified, GnuPG asks for the user-id unless
+---default-recipient is given.
+
+@item -R, ---hidden-recipient @code{name}
+@itemx 
+Encrypt for user id @code{name}, but hide the keyid of the key. This
+option hides the receiver of the message and is a countermeasure
+against traffic analysis. If this option or ---recipient is not
+specified, GnuPG asks for the user-id unless ---default-recipient is
+given.
 
 @item ---default-recipient @code{name}
 Use @code{name} as default recipient if option ---recipient is not used and
@@ -502,8 +544,16 @@ either by use of ---recipient or by the asked user id.
 No trust checking is performed for these user ids and
 even disabled keys can be used.
 
+@item ---hidden-encrypt-to @code{name}
+Same as ---hidden-recipient but this one is intended for use in the
+options file and may be used with your own user-id as a hidden
+"encrypt-to-self". These keys are only used when there are other
+recipients given either by use of ---recipient or by the asked user id.
+No trust checking is performed for these user ids and even disabled
+keys can be used.
+
 @item ---no-encrypt-to
-Disable the use of all ---encrypt-to keys.
+Disable the use of all ---encrypt-to and --hidden-encrypt-to keys.
 
 @item -v, ---verbose
 Give more information during processing. If used
@@ -518,12 +568,12 @@ disables compression. Default is to use the default
 compression level of zlib (normally 6).
 
 @item -t, ---textmode
-Use canonical text mode. If -t (but not
----textmode) is used together with armoring
-and signing, this enables clearsigned messages.
-This kludge is needed for PGP compatibility;
-normally you would use ---sign or --clearsign
-to selected the type of the signature.
+@itemx ---no-textmode
+Use canonical text mode. ---no-textmode disables this option. If -t
+(but not ---textmode) is used together with armoring and signing, this
+enables clearsigned messages. This kludge is needed for command-line
+compatibility with command-line versions of PGP; normally you would
+use ---sign or --clearsign to select the type of the signature.
 
 @item -n, ---dry-run
 Don't make any changes (this is not completely implemented).
@@ -532,18 +582,15 @@ Don't make any changes (this is not completely implemented).
 Prompt before overwriting any files.
 
 @item ---batch
-Use batch mode. Never ask, do not allow interactive
-commands.
+@itemx ---no-batch
+Use batch mode. Never ask, do not allow interactive commands.
+---no-batch disables this option.
 
 @item ---no-tty
 Make sure that the TTY (terminal) is never used for any output.
 This option is needed in some cases because GnuPG sometimes prints
 warnings to the TTY if ---batch is used.
 
-@item ---no-batch
-Disable batch mode. This may be of use if ---batch
-is enabled from an options file.
-
 @item ---yes
 Assume "yes" on most questions.
 
@@ -587,12 +634,28 @@ don't want to keep your secret keys (or one of them)
 online but still want to be able to check the validity of a given
 recipient's or signator's key. 
 
+@item ---trust-model @code{pgp|classic|always}
+Set what trust model GnuPG should follow. The models are:
+
+@table @asis
+@item pgp
+This is the web-of-trust combined with trust signatures as used in PGP
+5.x and later. This is the default trust model.
+
+@item classic
+This is the standard web-of-trust as used in PGP 2.x and earlier.
+
+@item always
+Skip key validation and assume that used keys are always fully
+trusted. You won't use this unless you have installed some external
+validation scheme. This option also suppresses the "[uncertain]" tag
+printed with signature checks when there is no evidence that the user
+ID is bound to the key.
+
+@end table
+
 @item ---always-trust
-Skip key validation and assume that used keys are always fully trusted.
-You won't use this unless you have installed some external validation
-scheme. This option also suppresses the "[uncertain]" tag printed
-with signature checks when there is no evidence that the user ID
-is bound to the key.
+Identical to `---trust-model always'
 
 @item ---keyserver @code{name}
 Use @code{name} as your keyserver. This is the server that ---recv-keys,
@@ -602,7 +665,8 @@ from, send keys to, and search for keys on. The format of the
 the type of keyserver: "hkp" for the Horowitz (or compatible)
 keyservers, "ldap" for the NAI LDAP keyserver, or "mailto" for the
 Horowitz email keyserver. Note that your particular installation of
-GnuPG may have other keyserver types available as well.
+GnuPG may have other keyserver types available as well. Keyserver
+schemes are case-insensitive.
 
 Most keyservers synchronize with each other, so there is generally no
 need to send keys to more than one server. Using the command "host -l
@@ -621,21 +685,19 @@ keyserver types, some common options are:
 
 @table @asis
 @item include-revoked
-When searching for a key, include keys that are marked on the
-keyserver as revoked. Note that this option is always set when using
-the NAI HKP keyserver, as this keyserver does not differentiate
-between revoked and unrevoked keys. When using the LDAP keyserver,
-this applies to both searching (---search-keys) and receiving
-(---recv-keys).
+When searching for a key with ---search-keys, include keys that are
+marked on the keyserver as revoked. Note that this option is always
+set when using the NAI HKP keyserver, as this keyserver does not
+differentiate between revoked and unrevoked keys.
 
 @item include-disabled
-When receiving or searching for a key, include keys that are marked on
-the keyserver as disabled. Note that this option is not used with HKP
-keyservers, as they do not support disabling keys.
+When searching for a key with ---search-keys, include keys that are
+marked on the keyserver as disabled. Note that this option is not
+used with HKP keyservers.
 
 @item include-subkeys
-When receiving a key, include subkeys in the search. Note that this
-option is not used with HKP keyservers, as they do not support
+When receiving a key, include subkeys as potential targets. Note that
+this option is not used with HKP keyservers, as they do not support
 retrieving keys by subkey id.
 
 @item use-temp-files
@@ -676,10 +738,11 @@ Allow importing key signatures marked as "local". This is not
 generally useful unless a shared keyring scheme is being used.
 Defaults to no.
 
-@item repair-hkp-subkey-bug
-During import, attempt to repair the HKP keyserver mangling multiple
-subkeys bug. Note that this cannot completely repair the damaged key
-as some crucial data is removed by the keyserver, but it does at least
+@item repair-pks-subkey-bug
+During import, attempt to repair the damage caused by the PKS
+keyserver bug (pre version 0.9.6) that mangles keys with multiple
+subkeys. Note that this cannot completely repair the damaged key as
+some crucial data is removed by the keyserver, but it does at least
 give you back one subkey. Defaults to no for regular ---import and to
 yes for keyserver ---recv-keys.
 
@@ -711,13 +774,11 @@ Include designated revoker information that was marked as
 @end table
 
 @item ---show-photos
+@itemx ---no-show-photos
 Causes ---list-keys, --list-sigs, --list-public-keys,
 ---list-secret-keys, and verifying a signature to also display the
-photo ID attached to the key, if any.
-See also ---photo-viewer.
-
-@item ---no-show-photos
-Resets the ---show-photos flag.
+photo ID attached to the key, if any. See also ---photo-viewer.
+---no-show-photos disables this option.
 
 @item ---photo-viewer @code{string}
 This is the command line that should be run to view a photo ID. "%i"
@@ -745,12 +806,11 @@ useful when you're listing a specific key or set of keys. It has no
 effect when listing all keys.
 
 @item ---keyring @code{file}
-Add @code{file} to the list of keyrings.
-If @code{file} begins with a tilde and a slash, these
-are replaced by the HOME directory. If the filename
-does not contain a slash, it is assumed to be in the
-home-directory ("~/.gnupg" if ---homedir is not used).
-The filename may be prefixed with a scheme:
+Add @code{file} to the list of keyrings. If @code{file} begins with a
+tilde and a slash, these are replaced by the HOME directory. If the
+filename does not contain a slash, it is assumed to be in the GnuPG
+home directory ("~/.gnupg" if ---homedir is not used). The filename
+may be prefixed with a scheme:
 
 "gnupg-ring:" is the default one.
 
@@ -759,6 +819,17 @@ It might make sense to use it together with ---no-default-keyring.
 @item ---secret-keyring @code{file}
 Same as ---keyring but for the secret keyrings.
 
+@item ---primary-keyring @code{file}
+Designate @code{file} as the primary public keyring. This means that
+newly imported keys (via ---import or keyserver --recv-from) will go to
+this keyring.
+
+@item ---trustdb-name @code{file}
+Use @code{file} instead of the default trustdb. If @code{file} begins
+with a tilde and a slash, these are replaced by the HOME directory. If
+the filename does not contain a slash, it is assumed to be in the
+GnuPG home directory ("~/.gnupg" if ---homedir is not used).
+
 @item ---homedir @code{directory}
 Set the name of the home directory to @code{directory} If this
 option is not used it defaults to "~/.gnupg". It does
@@ -812,10 +883,10 @@ Using this option will also prevent the creation of a
 "~./gnupg" homedir.
 
 @item ---load-extension @code{name}
-Load an extension module. If @code{name} does not
-contain a slash it is searched in "/usr/local/lib/gnupg"
-Extension are in gernal not useful anymore; the use of this 
-option is deprecated.
+Load an extension module. If @code{name} does not contain a slash it is
+searched for in the directory configured when GnuPG was built
+(generally "/usr/local/lib/gnupg"). Extensions are not generally
+useful anymore, and the use of this option is deprecated.
 
 @item ---debug @code{flags}
 Set debugging flags. All flags are or-ed and @code{flags} may
@@ -824,6 +895,11 @@ be given in C syntax (e.g. 0x0042).
 @item ---debug-all
 Set all useful debugging flags.
 
+@item ---enable-progress-filter
+Enable certain PROGRESS status outputs. This option allows frontends
+to display a progress indicator while gpg is processing larger files.
+There is a slight performance overhead using it.
+
 @item ---status-fd @code{n}
 Write special status strings to the file descriptor @code{n}.
 See the file DETAILS in the documentation for a listing of them.
@@ -838,20 +914,20 @@ needed to separate out the various subpackets from the stream
 delivered to the file descriptor.
 
 @item ---sk-comments
+@itemx ---no-sk-comments
 Include secret key comment packets when exporting secret keys. This
 is a GnuPG extension to the OpenPGP standard, and is off by default.
 Please note that this has nothing to do with the comments in clear
-text signatures or armor headers.
-
-@item ---no-sk-comments
-Resets the ---sk-comments option.
+text signatures or armor headers. ---no-sk-comments disables this
+option.
 
 @item ---no-comment
-See ---sk-comments. This option is deprecated and may be removed soon.
+See ---no-sk-comments. This option is deprecated and may be removed
+soon.
 
 @item ---comment @code{string}
-Use @code{string} as comment string in clear text signatures.
-The default is not do write a comment string.
+Use @code{string} as the comment string in clear text signatures. The
+default behavior is not to use a comment string.
 
 @item ---default-comment
 Force to write the standard comment string in clear
@@ -859,55 +935,69 @@ text signatures. Use this to overwrite a ---comment
 from a config file. This option is now obsolete because there is no
 default comment string anymore.
 
-@item ---no-version
-Omit the version string in clear text signatures.
-
 @item ---emit-version
-Force to write the version string in clear text
-signatures. Use this to overwrite a previous
----no-version from a config file.
+@itemx ---no-emit-version
+Force inclusion of the version string in ASCII armored output.
+---no-emit-version disables this option.
 
-@item -N, ---notation-data @code{name=value}
+@item ---sig-notation @code{name=value}
+@itemx ---cert-notation @code{name=value}
+@itemx -N, ---notation-data @code{name=value}
 Put the name value pair into the signature as notation data.
-@code{name} must consist only of alphanumeric characters, digits
-or the underscore; the first character must not be a digit.
-@code{value} may be any printable string; it will be encoded in UTF8,
-so you should check that your ---charset is set correctly.
-If you prefix @code{name} with an exclamation mark, the notation
-data will be flagged as critical (rfc2440:5.2.3.15).
+@code{name} must consist only of printable characters or spaces, and
+must contain a '@@' character. This is to help prevent pollution of
+the IETF reserved notation namespace. The ---expert flag overrides the
+'@@' check. @code{value} may be any printable string; it will be
+encoded in UTF8, so you should check that your ---charset is set
+correctly. If you prefix @code{name} with an exclamation mark, the
+notation data will be flagged as critical (rfc2440:5.2.3.15).
+---sig-notation sets a notation for data signatures. --cert-notation
+sets a notation for key signatures (certifications). ---notation-data
+sets both.
+
+There are special codes that may be used in notation names. "%k" will
+be expanded into the key ID of the key being signed, "%K" for the long
+key ID of the key being signed, "%f" for the key fingerprint of the
+key being signed, "%s" for the key ID of the key making the signature,
+"%S" for the long key ID of the key making the signature, and "%%"
+results in a single "%". %k, %K, and %f are only meaningful when
+making a key signature (certification).
 
 @item ---show-notation
-Show key signature notations in the ---list-sigs or --check-sigs
-listings.
-
-@item ---no-show-notation
-Do not show key signature notations in the ---list-sigs or --check-sigs
-listings.
-
-@item ---set-policy-url @code{string}
-Use @code{string} as Policy URL for signatures (rfc2440:5.2.3.19).
-If you prefix it with an exclamation mark, the policy URL
-packet will be flagged as critical.
+@itemx ---no-show-notation
+Show signature notations in the ---list-sigs or --check-sigs listings
+as well as when verifying a signature with a notation in it.
+---no-show-notation disables this option.
+
+@item ---sig-policy-url @code{string}
+@itemx ---cert-policy-url @code{string}
+@itemx ---set-policy-url @code{string}
+Use @code{string} as Policy URL for signatures (rfc2440:5.2.3.19). If
+you prefix it with an exclamation mark, the policy URL packet will be
+flagged as critical. ---sig-policy-url sets a a policy url for data
+signatures. ---cert-policy-url sets a policy url for key signatures
+(certifications). ---set-policy-url sets both.
+
+The same %-expandos used for notation data are available here as well.
 
 @item ---show-policy-url
-Show any policy URLs set in the ---list-sigs or --check-sigs listings.
-
-@item ---no-show-policy-url
-Do not show any policy URLs set in the ---list-sigs or --check-sigs
-listings.
+@itemx ---no-show-policy-url
+Show policy URLs in the ---list-sigs or --check-sigs listings as well
+as when verifying a signature with a policy URL in it.
+---no-show-policy-url disables this option.
 
 @item ---set-filename @code{string}
-Use @code{string} as the name of file which is stored in
-messages.
+Use @code{string} as the filename which is stored inside messages.
+This overrides the default, which is to use the actual filename of the
+file being encrypted.
 
 @item ---for-your-eyes-only
+@itemx ---no-for-your-eyes-only
 Set the `for your eyes only' flag in the message. This causes GnuPG
 to refuse to save the file unless the ---output option is given, and
 PGP to use the "secure viewer" with a Tempest-resistant font to
 display the message. This option overrides ---set-filename.
-
-@item ---no-for-your-eyes-only
-Resets the ---for-your-eyes-only flag.
+---no-for-your-eyes-only disables this option.
 
 @item ---use-embedded-filename
 Try to create a file with a name as embedded in the data.
@@ -934,6 +1024,16 @@ selected from the preferences stored with the key.
 Use @code{name} as the message digest algorithm. Running the program
 with the command ---version yields a list of supported algorithms.
 
+@item ---compress-algo @code{name}
+Use compression algorithm @code{name}. "zlib" is RFC1950 ZLIB
+compression. "zip" is RFC-1951 ZIP compression which is used by PGP.
+"uncompressed" or "none" disables compression. If this option is not
+used, the default behavior is to examine the recipient key preferences
+to see which algorithms the recipient supports. If all else fails,
+ZIP is used for maximum compatibility. Note, however, that ZLIB may
+give better compression results if that is more important, as the
+compression window size is not limited to 8k.
+
 @item ---cert-digest-algo @code{name}
 Use @code{name} as the message digest algorithm used when signing a
 key. Running the program with the command ---version yields a list of
@@ -945,21 +1045,19 @@ possibly your entire key.
 @item ---s2k-cipher-algo @code{name}
 Use @code{name} as the cipher algorithm used to protect secret keys.
 The default cipher is CAST5. This cipher is also used for
-conventional encryption if ---cipher-algo is not given.
+conventional encryption if ---personal-cipher-preferences and
+---cipher-algo is not given.
 
 @item ---s2k-digest-algo @code{name}
-Use @code{name} as the digest algorithm used to mangle the
-passphrases. The default algorithm is RIPE-MD-160.
-This digest algorithm is also used for conventional
-encryption if ---digest-algo is not given.
+Use @code{name} as the digest algorithm used to mangle the passphrases.
+The default algorithm is SHA-1.
 
 @item ---s2k-mode @code{n}
-Selects how passphrases are mangled. If @code{n} is 0
-a plain passphrase (which is not recommended) will be used,
-a 1 (default) adds a salt to the passphrase and
-a 3 iterates the whole process a couple of times.
-Unless ---rfc1991 is used, this mode is also used
-for conventional encryption.
+Selects how passphrases are mangled. If @code{n} is 0 a plain
+passphrase (which is not recommended) will be used, a 1 adds a salt to
+the passphrase and a 3 (the default) iterates the whole process a
+couple of times. Unless ---rfc1991 is used, this mode is also used for
+conventional encryption.
 
 @item ---simple-sk-checksum
 Secret keys are integrity protected by using a SHA-1 checksum. This
@@ -972,15 +1070,6 @@ when the secret key is encrypted - the simplest way to make this
 happen is to change the passphrase on the key (even changing it to the
 same value is acceptable).
 
-@item ---compress-algo @code{n}
-Use compression algorithm @code{n}. Default is 2 which is RFC1950
-compression. You may use 1 to use the old zlib version (RFC1951) which
-is used by PGP. 0 disables compression. The default algorithm may give
-better results because the window size is not limited to 8K. If this
-is not used the OpenPGP behavior is used, i.e. the compression
-algorithm is selected from the preferences; note, that this can't be
-done if you do not encrypt the data.
-
 @item ---disable-cipher-algo @code{name}
 Never allow the use of @code{name} as cipher algorithm.
 The given name will not be checked so that a later loaded algorithm
@@ -1008,18 +1097,20 @@ However, due to the fact that the signature creation needs manual
 interaction, this performance penalty does not matter in most settings.
 
 @item ---auto-check-trustdb
+@itemx ---no-auto-check-trustdb
 If GnuPG feels that its information about the Web-of-Trust has to be
-updated, it automatically runs the ---check-trustdb command 
-internally. This may be a time consuming process.
-
-@item ---no-auto-check-trustdb
-Resets the ---auto-check-trustdb option.
+updated, it automatically runs the ---check-trustdb command internally.
+This may be a time consuming process. ---no-auto-check-trustdb
+disables this option.
 
 @item ---throw-keyid
-Do not put the keyid into encrypted packets. This option
-hides the receiver of the message and is a countermeasure
-against traffic analysis. It may slow down the decryption
-process because all available secret keys are tried.
+Do not put the keyids into encrypted packets. This option hides the
+receiver of the message and is a countermeasure against traffic
+analysis. It may slow down the decryption process because all
+available secret keys are tried.
+
+@item ---no-throw-keyid
+Resets the ---throw-keyid option.
 
 @item ---not-dash-escaped
 This option changes the behavior of cleartext signatures
@@ -1031,11 +1122,12 @@ line, patch files don't have this. A special armor header
 line tells GnuPG about this cleartext signature option.
 
 @item ---escape-from-lines
-Because some mailers change lines starting with "From "
-to "<From " it is good to handle such lines in a special
-way when creating cleartext signatures. All other PGP
-versions do it this way too. This option is not enabled
-by default because it would violate rfc2440.
+@itemx ---no-escape-from-lines
+Because some mailers change lines starting with "From " to ">From
+" it is good to handle such lines in a special way when creating
+cleartext signatures to prevent the mail system from breaking the
+signature. Note that all other PGP versions do it this way too.
+Enabled by default. ---no-escape-from-lines disables this option.
 
 @item ---passphrase-fd @code{n}
 Read the passphrase from file descriptor @code{n}. If you use
@@ -1051,16 +1143,40 @@ together with ---status-fd. See the file doc/DETAILS in the source
 distribution for details on how to use it.
 
 @item ---use-agent
+@itemx ---no-use-agent
 Try to use the GnuPG-Agent. Please note that this agent is still under
 development. With this option, GnuPG first tries to connect to the
-agent before it asks for a passphrase.
+agent before it asks for a passphrase. ---no-use-agent disables this
+option.
 
 @item ---gpg-agent-info
 Override the value of the environment variable
 @samp{GPG_AGENT_INFO}. This is only used when ---use-agent has been given
 
+@item Compliance options
+These options control what GnuPG is compliant to. Only one of these
+options may be active at a time. Note that the default setting of
+this is nearly always the correct one. See the INTEROPERABILITY WITH
+OTHER OPENPGP PROGRAMS section below before using one of these
+options.
+
+@table @asis
+@item ---gnupg
+Use standard GnuPG behavior. This is essentially OpenPGP behavior
+(see ---openpgp), but with some additional workarounds for common
+compatibility problems in different versions of PGP. This is the
+default option, so it is not generally needed, but it may be useful to
+override a different compliance option in the gpg.conf file.
+
+@item ---openpgp
+Reset all packet, cipher and digest options to strict OpenPGP
+behavior. Use this option to reset all previous options like
+---rfc1991, --force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and
+---compress-algo to OpenPGP compliant values. All PGP workarounds are
+disabled.
+
 @item ---rfc1991
-Try to be more RFC1991 (PGP 2.x) compliant.
+Try to be more RFC-1991 (PGP 2.x) compliant.
 
 @item ---pgp2
 Set up all options to be as PGP 2.x compliant as possible, and warn if
@@ -1069,27 +1185,22 @@ a message that PGP 2.x will not be able to handle. Note that `PGP
 2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x
 available, but the MIT release is a good common baseline.
 
-This option implies `---rfc1991 --no-openpgp --disable-mdc
----no-force-v4-certs --no-comment --escape-from-lines --force-v3-sigs
+This option implies `---rfc1991 --disable-mdc --no-force-v4-certs
+---no-sk-comment --escape-from-lines --force-v3-sigs
 ---no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA
----digest-algo MD5 --compress-algo 1'
-
-@item ---no-pgp2
-Resets the ---pgp2 option.
+---digest-algo MD5 --compress-algo 1'. It also disables --textmode
+when encrypting.
 
 @item ---pgp6
 Set up all options to be as PGP 6 compliant as possible. This
 restricts you to the ciphers IDEA (if the IDEA plugin is installed),
 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the
-compression algorithms none and ZIP. This also disables making
-signatures with signing subkeys as PGP 6 does not understand
-signatures made by signing subkeys.
+compression algorithms none and ZIP. This also disables
+---throw-keyid, and making signatures with signing subkeys as PGP 6
+does not understand signatures made by signing subkeys.
 
-This option implies `---disable-mdc --no-comment --escape-from-lines
----force-v3-sigs --no-ask-sig-expire --compress-algo 1'
-
-@item ---no-pgp6
-Resets the ---pgp6 option.
+This option implies `---disable-mdc --no-sk-comment --escape-from-lines
+---force-v3-sigs --no-ask-sig-expire'
 
 @item ---pgp7
 Set up all options to be as PGP 7 compliant as possible. This is
@@ -1097,45 +1208,46 @@ identical to ---pgp6 except that MDCs are not disabled, and the list of
 allowable ciphers is expanded to add AES128, AES192, AES256, and
 TWOFISH.
 
-@item ---no-pgp7
-Resets the ---pgp7 option.
+@item ---pgp8
+Set up all options to be as PGP 8 compliant as possible. PGP 8 is a
+lot closer to the OpenPGP standard than previous versions of PGP, so
+all this does is disable ---throw-keyid and set --escape-from-lines.
+The allowed algorithms list is the same as ---pgp7 with the addition of
+the SHA-256 digest algorithm.
 
-@item ---openpgp
-Reset all packet, cipher and digest options to OpenPGP behavior. Use
-this option to reset all previous options like ---rfc1991,
----force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and
----compress-algo to OpenPGP compliant values. All PGP workarounds are
-also disabled.
+@end table
 
 @item ---force-v3-sigs
+@itemx ---no-force-v3-sigs
 OpenPGP states that an implementation should generate v4 signatures
 but PGP versions 5 and higher only recognize v4 signatures on key
 material. This option forces v3 signatures for signatures on data.
 Note that this option overrides ---ask-sig-expire, as v3 signatures
-cannot have expiration dates.
-
-@item ---no-force-v3-sigs
-Reset the ---force-v3-sigs option.
+cannot have expiration dates. ---no-force-v3-sigs disables this
+option.
 
 @item ---force-v4-certs
+@itemx ---no-force-v4-certs
 Always use v4 key signatures even on v3 keys. This option also
 changes the default hash algorithm for v3 RSA keys from MD5 to SHA-1.
-
-@item ---no-force-v4-certs
-Reset the ---force-v4-certs option.
+---no-force-v4-certs disables this option.
 
 @item ---force-mdc
-Force the use of encryption with appended manipulation code. This is
-always used with the newer ciphers (those with a blocksize greater
-than 64 bit).
+Force the use of encryption with a modification detection code. This
+is always used with the newer ciphers (those with a blocksize greater
+than 64 bits), or if all of the recipient keys indicate MDC support in
+their feature flags.
+
+@item ---disable-mdc
+Disable the use of the modification detection code. Note that by
+using this option, the encrypted message becomes vulnerable to a
+message modification attack.
 
 @item ---allow-non-selfsigned-uid
+@itemx ---no-allow-non-selfsigned-uid
 Allow the import and use of keys with user IDs which are not
 self-signed. This is not recommended, as a non self-signed user ID is
-trivial to forge.
-
-@item ---no-allow-non-selfsigned-uid
-Reset the ---allow-non-selfsigned-uid option.
+trivial to forge. ---no-allow-non-selfsigned-uid disables.
 
 @item ---allow-freeform-uid
 Disable all checks on the form of the user ID while generating a new
@@ -1195,14 +1307,17 @@ slower random generation.
 Reset verbose level to 0.
 
 @item ---no-greeting
-Suppress the initial copyright message but do not
-enter batch mode.
+Suppress the initial copyright message.
 
 @item ---no-secmem-warning
 Suppress the warning about "using insecure memory".
 
 @item ---no-permission-warning
-Suppress the warning about unsafe file permissions.
+Suppress the warning about unsafe file permissions. Note that the
+file permission checks that GnuPG performs are not intended to be
+authoritative, rather they simply warn about certain common permission
+problems. Do not assume that the lack of a warning means that your
+system is secure.
 
 @item ---no-mdc-warning
 Suppress the warning about missing MDC integrity protection.
@@ -1238,8 +1353,8 @@ can get a faster listing. The exact behaviour of this option may change
 in future versions.
 
 @item ---fixed-list-mode
-Do not merge user ID and primary key in ---with-colon listing mode and
-print all timestamps as seconds since 1970-01-01.
+Do not merge primary user ID and primary key in ---with-colon listing
+mode and print all timestamps as seconds since 1970-01-01.
 
 @item ---list-only
 Changes the behaviour of some commands. This is like ---dry-run but
@@ -1276,30 +1391,26 @@ content of an encrypted message; using this option you can do this without
 handing out the secret key.
 
 @item ---ask-sig-expire
+@itemx ---no-ask-sig-expire
 When making a data signature, prompt for an expiration time. If this
 option is not specified, the expiration time is "never".
-
-@item ---no-ask-sig-expire
-Resets the ---ask-sig-expire option.
+---no-ask-sig-expire disables this option.
 
 @item ---ask-cert-expire
+@itemx ---no-ask-cert-expire
 When making a key signature, prompt for an expiration time. If this
 option is not specified, the expiration time is "never".
-
-@item ---no-ask-cert-expire
-Resets the ---ask-cert-expire option.
+---no-ask-cert-expire disables this option.
 
 @item ---expert
+@itemx ---no-expert
 Allow the user to do certain nonsensical or "silly" things like
 signing an expired or revoked key, or certain potentially incompatible
 things like generating deprecated key types. This also disables
 certain warning messages about potentially incompatible actions. As
 the name implies, this option is for experts only. If you don't fully
 understand the implications of what it allows you to do, leave this
-off.
-
-@item ---no-expert
-Resets the ---expert option.
+off. ---no-expert disables this option.
 
 @item ---merge-only
 Don't insert new keys into the keyrings while doing an import.
@@ -1323,12 +1434,16 @@ Experimental use only.
 
 @item ---group @code{name=value1 value2 value3 ...}
 Sets up a named group, which is similar to aliases in email programs.
-Any time the group name is a receipient (-r or ---recipient), it will
+Any time the group name is a recipient (-r or ---recipient), it will
 be expanded to the values specified.
+
 The values are @code{key IDs} or fingerprints, but any key description
 is accepted. Note that a value with spaces in it will be treated as
 two different values. Note also there is only one level of expansion
-- you cannot make an group that points to another group.
+- you cannot make an group that points to another group. When used
+from the command line, it may be necessary to quote the argument to
+this option to prevent the shell from treating it as multiple
+arguments.
 
 @item ---preserve-permissions
 Don't change the permissions of a secret keyring back to user
@@ -1339,19 +1454,24 @@ Set the list of personal cipher preferences to @code{string}, this list
 should be a string similar to the one printed by the command "pref" in
 the edit menu. This allows the user to factor in their own preferred
 algorithms when algorithms are chosen via recipient key preferences.
+The most highly ranked cipher in this list is also used for the
+---symmetric encryption command.
 
 @item ---personal-digest-preferences @code{string}
 Set the list of personal digest preferences to @code{string}, this list
 should be a string similar to the one printed by the command "pref" in
 the edit menu. This allows the user to factor in their own preferred
 algorithms when algorithms are chosen via recipient key preferences.
+The most highly ranked digest algorithm in this list is algo used when
+signing without encryption (e.g. ---clearsign or --sign).
 
 @item ---personal-compress-preferences @code{string}
 Set the list of personal compression preferences to @code{string}, this
 list should be a string similar to the one printed by the command
 "pref" in the edit menu. This allows the user to factor in their own
 preferred algorithms when algorithms are chosen via recipient key
-preferences.
+preferences. The most highly ranked algorithm in this list is also
+used when there are no recipient keys to consider (e.g. ---symmetric).
 
 @item ---default-preference-list @code{string}
 Set the list of default preferences to @code{string}, this list should
@@ -1362,8 +1482,8 @@ menu.
 @end table
 
 @majorheading How to specify a user ID
-There are different ways on how to specify a user ID to GnuPG;
-here are some examples:
+There are different ways to specify a user ID to GnuPG; here are some
+examples:
 
 @table @asis
 @item 
@@ -1460,7 +1580,7 @@ The first is the path to the Unix Domain Socket, the second the PID of
 the gpg-agent and the protocol version which should be set to 1. When
 starting the gpg-agent as described in its documentation, this
 variable is set to the correct value. The option ---gpg-agent-info can
-be used to overide it.
+be used to override it.
 
 @item http_proxy
 Only honored when the keyserver-option
@@ -1518,7 +1638,33 @@ is *very* easy to spy out your passphrase!
 
 If you are going to verify detached signatures, make sure that the
 program knows about it; either be giving both filenames on the
-commandline or using @samp{-} to specify stdin.
+command line or using @samp{-} to specify stdin.
+
+@majorheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
+GnuPG tries to be a very flexible implementation of the OpenPGP
+standard. In particular, GnuPG implements many of the "optional"
+parts of the standard, such as the RIPEMD/160 hash, and the ZLIB
+compression algorithms. It is important to be aware that not all
+OpenPGP programs implement these optional algorithms and that by
+forcing their use via the ---cipher-algo, --digest-algo,
+---cert-digest-algo, or --compress-algo options in GnuPG, it is
+possible to create a perfectly valid OpenPGP message, but one that
+cannot be read by the intended recipient.
+
+For example, as of this writing, no version of official PGP supports
+the BLOWFISH cipher algorithm. If you use it, no PGP user will be
+able to decrypt your message. The same thing applies to the ZLIB
+compression algorithm. By default, GnuPG uses the OpenPGP preferences
+system that will always do the right thing and create messages that
+are usable by all recipients, regardless of which OpenPGP program they
+use. Only override this safe default if you know what you are doing.
+
+If you absolutely must override the safe default, or if the
+preferences on a given key are invalid for some reason, you are far
+better off using the ---pgp2, --pgp6, --pgp7, or --pgp8 options. These
+options are safe as they do not force any particular algorithms in
+violation of OpenPGP, but rather reduce the available algorithms to a
+"PGP-safe" list.
 
 @majorheading BUGS
 On many systems this program should be installed as setuid(root). This
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index 91e2fcadf..6ac5c6884 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -18,7 +18,7 @@
 @end menu
 
 @majorheading Name
-gpgv ---- signature verification tool
+gpgv ---- signature verification tool</>
 
 @majorheading Synopsis
 
diff --git a/po/de.po b/po/de.po
index d11d8d9bc..48a3ff752 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-11-11 19:56+0100\n"
+"POT-Creation-Date: 2003-05-27 10:12+0200\n"
 "PO-Revision-Date: 2002-09-11 15:40+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:1032 util/miscutil.c:333
+#: util/miscutil.c:333 g10/keyedit.c:1072
 msgid "quit"
 msgstr "quit"
 
@@ -282,63 +282,63 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:381 g10/import.c:200 g10/keygen.c:1820
+#: cipher/random.c:384 g10/keygen.c:1902 g10/import.c:200
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -364,7 +364,24 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:316
+#: cipher/md.c:142
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+
+#: cipher/md.c:149
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+
+#: g10/g10.c:320
 msgid ""
 "@Commands:\n"
 " "
@@ -372,163 +389,163 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:319
+#: g10/g10.c:323
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:321
+#: g10/g10.c:325
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "|[files]|encrypt files"
 msgstr "|[Dateien]|Dateien verschl�sseln"
 
-#: g10/g10.c:323
+#: g10/g10.c:327
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:325
+#: g10/g10.c:329
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "|[files]|decrypt files"
 msgstr "|[Dateien]|Dateien entschl�sseln"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:329
+#: g10/g10.c:333
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:331
+#: g10/g10.c:335
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:333
+#: g10/g10.c:337
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:334
+#: g10/g10.c:338
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:335
+#: g10/g10.c:339
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:338
+#: g10/g10.c:342
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:339
+#: g10/g10.c:343
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/g10.c:341
+#: g10/g10.c:345
 msgid "sign a key non-revocably"
 msgstr "Schl�ssel nicht widerrufbar signieren"
 
-#: g10/g10.c:342
+#: g10/g10.c:346
 msgid "sign a key locally and non-revocably"
 msgstr "Schl�ssel nur f�r diesen Rechner und nicht-widerrufbar signieren"
 
-#: g10/g10.c:343
+#: g10/g10.c:347
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:344
+#: g10/g10.c:348
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:346
+#: g10/g10.c:350
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:347
+#: g10/g10.c:351
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:348
+#: g10/g10.c:352
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:350
+#: g10/g10.c:354
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/g10.c:352
+#: g10/g10.c:356
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/g10.c:356
+#: g10/g10.c:360
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:358
+#: g10/g10.c:362
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:360
+#: g10/g10.c:364
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:362
+#: g10/g10.c:366
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:364
+#: g10/g10.c:368
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:366
+#: g10/g10.c:370
 msgid "unattended trust database update"
 msgstr "unbeaufsichtigtes �ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:367
+#: g10/g10.c:371
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:368
+#: g10/g10.c:372
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:370
+#: g10/g10.c:374
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:372
+#: g10/g10.c:376
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:376
+#: g10/g10.c:380 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -538,201 +555,202 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:378
+#: g10/g10.c:382
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:380
+#: g10/g10.c:384
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:384
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:386
+#: g10/g10.c:390
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:393
+#: g10/g10.c:397
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:394
+#: g10/g10.c:398
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:396
+#: g10/g10.c:400
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:403
+#: g10/g10.c:408
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:404
+#: g10/g10.c:409 g10/gpgv.c:66
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:405
+#: g10/g10.c:410 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:406
+#: g10/g10.c:411
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:407
+#: g10/g10.c:412
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:408
+#: g10/g10.c:413
 msgid "do not force v3 signatures"
 msgstr "v3 Signaturen nicht erzwingen"
 
-#: g10/g10.c:409
+#: g10/g10.c:414
 msgid "force v4 key signatures"
 msgstr "v4 Signaturen erzwingen"
 
-#: g10/g10.c:410
+#: g10/g10.c:415
 msgid "do not force v4 key signatures"
 msgstr "v4 Signaturen nicht erzwingen"
 
-#: g10/g10.c:411
+#: g10/g10.c:416
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:413
+#: g10/g10.c:418
 msgid "never use a MDC for encryption"
 msgstr "Beim Verschl�sseln niemals ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:415
+#: g10/g10.c:420
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/g10.c:416
+#: g10/g10.c:421
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/g10.c:417
+#: g10/g10.c:422
 msgid "use the gpg-agent"
 msgstr "den GPG-Agent verwenden"
 
-#: g10/g10.c:420
+#: g10/g10.c:425
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:421
+#: g10/g10.c:426
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:422
+#: g10/g10.c:427
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:423
+#: g10/g10.c:428
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:425
+#: g10/g10.c:430
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:426
+#: g10/g10.c:431
 msgid "show which keyring a listed key is on"
 msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
 
-#: g10/g10.c:427
+#: g10/g10.c:432
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:428
+#: g10/g10.c:433
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:432
+#: g10/g10.c:437
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:433
+#: g10/g10.c:438
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:437
+#: g10/g10.c:442 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:439
+#: g10/g10.c:444
 msgid "|[file]|write status info to file"
 msgstr "|[Datei]|Statusinfo in Datei schreiben"
 
-#: g10/g10.c:451
+#: g10/g10.c:456
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:452
+#: g10/g10.c:457
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:453
+#: g10/g10.c:463
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:454
+#: g10/g10.c:464
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:455
+#: g10/g10.c:465
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
 "Hashoptionen auf PGP 2.X-Verhalten einstellen"
 
-#: g10/g10.c:461
+#: g10/g10.c:469
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:463
+#: g10/g10.c:471
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:465
+#: g10/g10.c:473
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:467
+#: g10/g10.c:475
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: g10/g10.c:468
+#: g10/g10.c:476
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:470
-msgid "|N|use compress algorithm N"
+#: g10/g10.c:478
+#, fuzzy
+msgid "|NAME|use compression algorithm NAME"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:471
+#: g10/g10.c:479
 msgid "throw keyid field of encrypted packets"
 msgstr "Empf�nger-ID verschl�sselter Pakete entfernen"
 
-#: g10/g10.c:473
+#: g10/g10.c:481
 msgid "Show Photo IDs"
 msgstr "Foto-IDs anzeigen"
 
-#: g10/g10.c:474
+#: g10/g10.c:482
 msgid "Don't show Photo IDs"
 msgstr "Foto-IDs nicht anzeigen"
 
-#: g10/g10.c:475
+#: g10/g10.c:483
 msgid "Set command line to view Photo IDs"
 msgstr "Kommandozeilentext f�r den Foto-Betrachter setzen"
 
-#: g10/g10.c:481
+#: g10/g10.c:489
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -741,7 +759,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:484
+#: g10/g10.c:492
 msgid ""
 "@\n"
 "Examples:\n"
@@ -761,17 +779,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:640
+#: g10/g10.c:653 g10/gpgv.c:95
 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:644
+#: g10/g10.c:657
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:647
+#: g10/g10.c:660
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -781,7 +799,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten.\n"
 
-#: g10/g10.c:658
+#: g10/g10.c:671
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -789,353 +807,404 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:762
+#: g10/g10.c:674
+msgid "Pubkey: "
+msgstr ""
+
+#: g10/g10.c:680 g10/keyedit.c:1666
+msgid "Cipher: "
+msgstr ""
+
+#: g10/g10.c:686
+msgid "Hash: "
+msgstr ""
+
+#: g10/g10.c:692 g10/keyedit.c:1712
+#, fuzzy
+msgid "Compression: "
+msgstr "Kommentar: "
+
+#: g10/g10.c:775
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:830
+#: g10/g10.c:843
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:848
+#: g10/g10.c:861
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis von %s \"%s\"\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1029
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis von %s \"%s\"\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1032
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis von %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1038
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte f�r %s \"%s\"\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1041
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte f�r %s \"%s\"\n"
 
-#: g10/g10.c:1026
+#: g10/g10.c:1044
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte f�r %s \"%s\"\n"
 
-#: g10/g10.c:1032
+#: g10/g10.c:1050
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis von %s \"%s\"\n"
 
-#: g10/g10.c:1035
+#: g10/g10.c:1053
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis von %s \"%s\"\n"
 
-#: g10/g10.c:1038
+#: g10/g10.c:1056
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis von %s \"%s\"\n"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1062
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte f�r %s \"%s\"\n"
 
-#: g10/g10.c:1047
+#: g10/g10.c:1065
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file \"%s"
 "\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte f�r %s \"%s\"\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1068
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte f�r %s \"%s\"\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1262
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1272
+#: g10/g10.c:1298
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1276
+#: g10/g10.c:1302
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1283
+#: g10/g10.c:1309
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1472 g10/g10.c:1805 g10/g10.c:1816
+#: g10/g10.c:1502 g10/g10.c:1864 g10/g10.c:1875
 #, 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:1484
+#: g10/g10.c:1515
 #, 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:1627
+#: g10/g10.c:1680
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1698
 msgid "could not parse keyserver URI\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1707
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:1657
+#: g10/g10.c:1710
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:1664
+#: g10/g10.c:1717
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1720
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:1673
+#: g10/g10.c:1726
 #, 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:1794
+#: g10/g10.c:1853
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1798
+#: g10/g10.c:1857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:1807 g10/g10.c:1826
+#: g10/g10.c:1866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1810
+#: g10/g10.c:1869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1836
+#: g10/g10.c:1890
 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:1842
+#: g10/g10.c:1896
 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:1848
+#: g10/g10.c:1902
 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:1861
+#: g10/g10.c:1915
 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/encode.c:409 g10/encode.c:459 g10/encode.c:710 g10/g10.c:1886
-#: g10/pkclist.c:821 g10/pkclist.c:859 g10/sign.c:647 g10/sign.c:879
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
-
-#: g10/g10.c:1934 g10/g10.c:1952
+#: g10/g10.c:1987 g10/g10.c:2011
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1940 g10/g10.c:1958
+#: g10/g10.c:1993 g10/g10.c:2017
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1946
+#: g10/g10.c:1999
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
+
+#: g10/g10.c:2005
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1961
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
-
-#: g10/g10.c:1963
+#: g10/g10.c:2020
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1965
+#: g10/g10.c:2022
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1967
+#: g10/g10.c:2024
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:1970
+#: g10/g10.c:2027
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1974
+#: g10/g10.c:2031
 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:1978
+#: g10/g10.c:2035
 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:1984
+#: g10/g10.c:2041
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:1992
+#: g10/g10.c:2049
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:1996
+#: g10/g10.c:2053
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2000
+#: g10/g10.c:2057
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2093
+#: g10/g10.c:2100
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/g10.c:2105
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/g10.c:2110
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/g10.c:2203
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2103
+#: g10/g10.c:2213
 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:2113
+#: g10/g10.c:2223
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2120
+#: g10/g10.c:2230
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2128
+#: g10/g10.c:2238
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:2145
+#: g10/g10.c:2255
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:2158
+#: g10/g10.c:2268
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2172
+#: g10/g10.c:2282
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:2181
+#: g10/g10.c:2291
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:2199
+#: g10/g10.c:2309
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:2210
+#: g10/g10.c:2320
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:2218
+#: g10/g10.c:2328
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:2226
+#: g10/g10.c:2336
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:2234
+#: g10/g10.c:2344
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:2242
+#: g10/g10.c:2352
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/encode.c:417 g10/g10.c:2298 g10/sign.c:790
+#: g10/g10.c:2408 g10/encode.c:422 g10/sign.c:825
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:2313
+#: g10/g10.c:2423
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:2405
+#: g10/g10.c:2461
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2463
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "enum_secret_keys fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2465
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2477
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2487
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "enum_secret_keys fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2528
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2413
+#: g10/g10.c:2536
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2500
+#: g10/g10.c:2623
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2709
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:2590
+#: g10/g10.c:2713
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2593 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:2716 g10/decrypt.c:61 g10/decrypt.c:110 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:2807
+#: g10/g10.c:2998
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1143,127 +1212,153 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:2816
+#: g10/g10.c:3007
+#, fuzzy
+msgid "a user notation name must contain the '@' character\n"
+msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
+
+#: g10/g10.c:3015
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:2853
+#: g10/g10.c:3052
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:2855
+#: g10/g10.c:3054
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/armor.c:314
+#: g10/gpgv.c:68
+#, fuzzy
+msgid "take the keys from this keyring"
+msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? "
+
+#: g10/gpgv.c:70
+#, fuzzy
+msgid "make timestamp conflicts only a warning"
+msgstr "Zeitangaben differieren"
+
+#: g10/gpgv.c:99
+#, fuzzy
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
+
+#: g10/gpgv.c:102
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+
+#: g10/armor.c:321
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-H�lle: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:350
 msgid "invalid armor header: "
 msgstr "Ung�ltige ASCII-H�lle"
 
-#: g10/armor.c:350
+#: g10/armor.c:357
 msgid "armor header: "
 msgstr "ASCII-H�lle: "
 
-#: g10/armor.c:361
+#: g10/armor.c:368
 msgid "invalid clearsig header\n"
 msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:420
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:544
 msgid "invalid dash escaped line: "
 msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:549
+#: g10/armor.c:556
 msgid "unexpected armor:"
 msgstr "Unerwartete ASCII-H�lle:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:682 g10/armor.c:1258
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:725
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:759
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:763
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:767 g10/armor.c:1295
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:787
 msgid "premature eof (in Trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:791
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1073
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1078
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1082
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-H�lle gefunden - m�glicherweise\n"
 " war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/pkclist.c:62
+#: g10/pkclist.c:63 g10/revoke.c:575
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:64
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key is superseded"
 msgstr "Schl�ssel ist �berholt"
 
-#: g10/pkclist.c:66
+#: g10/pkclist.c:67 g10/revoke.c:576
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schl�ssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:68
+#: g10/pkclist.c:69 g10/revoke.c:578
 msgid "Key is no longer used"
 msgstr "Schl�ssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:70
+#: g10/pkclist.c:71 g10/revoke.c:579
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr g�ltig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "Grund f�r Widerruf: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
 #. a string with valid answers
-#: g10/pkclist.c:264
+#: g10/pkclist.c:265
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:273
 #, c-format
 msgid ""
 "No trust value assigned to:\n"
@@ -1272,11 +1367,11 @@ msgstr ""
 "Es ist kein \"trust value\" zugewiesen f�r:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/mainproc.c:1428 g10/pkclist.c:300
+#: g10/pkclist.c:301 g10/mainproc.c:1441
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/keyedit.c:297 g10/pkclist.c:311
+#: g10/pkclist.c:312 g10/keyedit.c:299
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1289,110 +1384,108 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/pkclist.c:315
+#: g10/pkclist.c:316
 #, fuzzy, c-format
 msgid " %d = I don't know\n"
 msgstr " %d = Wei� nicht so recht\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:318
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = Nein, ihm traue ich NICHT\n"
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm einigerma�en\n"
 
-#: g10/pkclist.c:321
+#: g10/pkclist.c:322
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/pkclist.c:323
+#: g10/pkclist.c:324
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Ich vertraue ihm absolut\n"
 
 #. not yet implemented
-#: g10/pkclist.c:326
+#: g10/pkclist.c:327
 msgid " i = please show me more information\n"
 msgstr " i = Bitte weitere Information anzeigen\n"
 
-#: g10/pkclist.c:329
+#: g10/pkclist.c:330
 msgid " m = back to the main menu\n"
 msgstr " m = Zur�ck zum Men�\n"
 
-#: g10/pkclist.c:332
+#: g10/pkclist.c:333
 msgid " s = skip this key\n"
 msgstr " s = diesen Schl�ssel �berSpringen\n"
 
-#: g10/pkclist.c:333
+#: g10/pkclist.c:334
 msgid " q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:338
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:344 g10/revoke.c:604
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:364
+#: g10/pkclist.c:365
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "M�chten Sie diesem Schl�ssel wirklich uneingeschr�nkt vertrauen? "
 
-#: g10/pkclist.c:378
+#: g10/pkclist.c:379
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate f�hren zu einem letztlich vertrauensw�rdigen Schl�ssel:\n"
 
-#: g10/pkclist.c:453
+#: g10/pkclist.c:454
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:460 g10/pkclist.c:472 g10/pkclist.c:566
+#: g10/pkclist.c:461 g10/pkclist.c:473 g10/pkclist.c:572
 msgid "Use this key anyway? "
 msgstr "Diesen Schl�ssel trotzdem benutzen? "
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:466
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:486
+#: g10/pkclist.c:487
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:496
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:497
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
 #: g10/pkclist.c:508
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Es ist nicht sicher, da� dieser Schl�ssel wirklich dem vorgeblichen\n"
-"Besitzer geh�rt, aber er wird trotzdem akzeptiert\n"
+"%08lX: Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
+"Besitzer geh�rt.\n"
 
 #: g10/pkclist.c:514
-msgid "This key probably belongs to the owner\n"
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt h�chstwahrscheinlich dem angegebenen Besitzer\n"
 
@@ -1402,7 +1495,7 @@ msgstr ""
 "Dieser Schl�ssel geh�rt uns (da wir n�mlich den geheimen Schl�ssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:567
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -1413,83 +1506,83 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:575 g10/pkclist.c:597
+#: g10/pkclist.c:581 g10/pkclist.c:611
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:616
+#: g10/pkclist.c:622
 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:617
+#: g10/pkclist.c:623
 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:623
+#: g10/pkclist.c:629
 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:628
+#: g10/pkclist.c:634
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schl�ssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:633
+#: g10/pkclist.c:639
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:644
+#: g10/pkclist.c:650
 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:646
+#: g10/pkclist.c:652
 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:654
+#: g10/pkclist.c:660
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:655
+#: g10/pkclist.c:661
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:663
+#: g10/pkclist.c:669
 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:665
+#: g10/pkclist.c:671
 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/encode.c:706 g10/pkclist.c:817 g10/pkclist.c:855
+#: g10/pkclist.c:823 g10/pkclist.c:859 g10/encode.c:721
 #, 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:832 g10/pkclist.c:868 g10/pkclist.c:1020 g10/pkclist.c:1080
+#: g10/pkclist.c:836 g10/pkclist.c:869 g10/pkclist.c:1027 g10/pkclist.c:1087
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:842 g10/pkclist.c:1052
+#: g10/pkclist.c:846 g10/pkclist.c:1059
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 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:898
+#: g10/pkclist.c:899
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1497,138 +1590,145 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:914
+#: g10/pkclist.c:915
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:919 g10/pkclist.c:995
+#: g10/pkclist.c:920 g10/pkclist.c:1002
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:937
+#: g10/pkclist.c:938
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:944
+#: g10/pkclist.c:945
 msgid "skipped: public key already set\n"
 msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 
-#: g10/pkclist.c:987
+#: g10/pkclist.c:994
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:1032
+#: g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1087
+#: g10/pkclist.c:1094
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
-#: g10/keygen.c:184
+#: g10/keygen.c:193
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "Voreinstellung %c%lu ist doppelt\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:200
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zu viele `%c' Voreinstellungen\n"
 
-#: g10/keygen.c:193
+#: g10/keygen.c:202
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "zu viele `%c' Voreinstellungen\n"
 
-#: g10/keygen.c:195
+#: g10/keygen.c:204
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "zu viele `%c' Voreinstellungen\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:293
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ung�ltiges Zeichen in den Voreinstellungen\n"
 
-#: g10/keygen.c:535
+#: g10/keygen.c:611
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:574
+#: g10/keygen.c:650
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:618
+#: g10/keygen.c:694
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:672 g10/keygen.c:756 g10/keygen.c:847
+#: g10/keygen.c:748 g10/keygen.c:832 g10/keygen.c:923
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:677 g10/keygen.c:761 g10/keygen.c:852
+#: g10/keygen.c:753 g10/keygen.c:837 g10/keygen.c:928
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:952
+#: g10/keygen.c:1028
 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:954
+#: g10/keygen.c:1030
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:955
+#: g10/keygen.c:1031
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:957
+#: g10/keygen.c:1033
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:959
+#: g10/keygen.c:1035
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1036
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:1038
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:1040
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keyedit.c:306 g10/keyedit.c:327 g10/keyedit.c:343 g10/keyedit.c:700
-#: g10/keygen.c:967
+#: g10/keygen.c:1043 g10/keyedit.c:308 g10/keyedit.c:329 g10/keyedit.c:345
+#: g10/keyedit.c:740
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:977 g10/keygen.c:995
-msgid "The use of this algorithm is deprecated - create anyway? "
+#: g10/keygen.c:1069
+msgid ""
+"The use of this algorithm is only supported by GnuPG.  You will not be\n"
+"able to use this key to communicate with PGP users.  This algorithm is also\n"
+"very slow, and may not be as secure as the other choices.\n"
 msgstr ""
-"Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
 
-#: g10/keyedit.c:713 g10/keygen.c:1009
+#: g10/keygen.c:1074
+#, fuzzy
+msgid "Create anyway? "
+msgstr "Diesen Schl�ssel trotzdem benutzen? "
+
+#: g10/keygen.c:1089 g10/keyedit.c:753 g10/revoke.c:637
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/keygen.c:1022
+#: g10/keygen.c:1102
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1641,19 +1741,19 @@ msgstr ""
 "              standard Schl�ssell�nge ist 1024 Bit\n"
 "      gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
 
-#: g10/keygen.c:1031
+#: g10/keygen.c:1111
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:1036
+#: g10/keygen.c:1116
 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:1038
+#: g10/keygen.c:1118
 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:1041
+#: g10/keygen.c:1121
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
@@ -1665,12 +1765,12 @@ msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:1052
+#: g10/keygen.c:1132
 #, 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:1057
+#: g10/keygen.c:1137
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1678,11 +1778,11 @@ msgstr ""
 "Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1140
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
 
-#: g10/keygen.c:1061
+#: g10/keygen.c:1141
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1690,17 +1790,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:1070
+#: g10/keygen.c:1150
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:1073 g10/keygen.c:1077
+#: g10/keygen.c:1153 g10/keygen.c:1157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1208
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1716,7 +1816,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:1137
+#: g10/keygen.c:1217
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1732,30 +1832,30 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1239
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:1161
+#: g10/keygen.c:1241
 msgid "Signature is valid for? (0) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:1166
+#: g10/keygen.c:1246
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1251
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s verf�llt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:1178
+#: g10/keygen.c:1258
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s verf�llt am %s\n"
 
-#: g10/keygen.c:1184
+#: g10/keygen.c:1264
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1763,11 +1863,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1189
+#: g10/keygen.c:1269
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1232
+#: g10/keygen.c:1312
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1783,44 +1883,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1324
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1252
+#: g10/keygen.c:1332
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1254
+#: g10/keygen.c:1334
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1256
+#: g10/keygen.c:1336
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1344
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1275
+#: g10/keygen.c:1355
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1283
+#: g10/keygen.c:1363
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1289
+#: g10/keygen.c:1369
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1312
+#: g10/keygen.c:1392
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1318
+#: g10/keygen.c:1398
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1831,27 +1931,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1322
+#: g10/keygen.c:1402
 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:1327
+#: g10/keygen.c:1407
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1417
 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:1338
+#: g10/keygen.c:1418
 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:1357
+#: g10/keygen.c:1437
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1396
+#: g10/keygen.c:1476
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1859,16 +1959,16 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:918 g10/keygen.c:1404
+#: g10/keygen.c:1485 g10/keyedit.c:958
 msgid "passphrase not correctly repeated; try again"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keygen.c:1405
+#: g10/keygen.c:1486
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1411
+#: g10/keygen.c:1492
 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"
@@ -1881,7 +1981,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1432
+#: g10/keygen.c:1513
 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"
@@ -1892,53 +1992,53 @@ 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:1996
+#: g10/keygen.c:2078
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:2050
+#: g10/keygen.c:2132
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2157 g10/keygen.c:2245
+#: g10/keygen.c:2239 g10/keygen.c:2327
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2247
+#: g10/keygen.c:2240 g10/keygen.c:2329
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2234
+#: g10/keygen.c:2316
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2240
+#: g10/keygen.c:2322
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2254
+#: g10/keygen.c:2336
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2261
+#: g10/keygen.c:2343
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2281
+#: g10/keygen.c:2363
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2282
+#: g10/keygen.c:2364
 msgid "key marked as ultimately trusted.\n"
 msgstr "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
 
-#: g10/keygen.c:2293
+#: g10/keygen.c:2375
 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"
@@ -1947,12 +2047,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:2305 g10/keygen.c:2415
+#: g10/keygen.c:2387 g10/keygen.c:2498
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:2351 g10/sign.c:257
+#: g10/keygen.c:2433 g10/sign.c:258
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1960,7 +2060,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2353 g10/sign.c:259
+#: g10/keygen.c:2435 g10/sign.c:260
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1968,134 +2068,146 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2362
+#: g10/keygen.c:2444
 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:2391
+#: g10/keygen.c:2473
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/decrypt.c:92 g10/encode.c:765
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:179 g10/tdbio.c:532 g10/tdbio.c:593 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1036
+#: g10/encode.c:208 g10/sign.c:1078
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:213
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "Aufgrund des S2K-Modus kann ein symmetrisches ESK Packet nicht benutzt "
 "werden\n"
 
-#: g10/encode.c:229 g10/encode.c:487
+#: g10/encode.c:230 g10/encode.c:493
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:296 g10/encode.c:523
+#: g10/encode.c:300 g10/encode.c:532
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:407
+#: g10/encode.c:413
 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:423
+#: g10/encode.c:428
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:457
+#: g10/encode.c:464
 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:468 g10/encode.c:647
+#: g10/encode.c:474 g10/encode.c:662
 #, 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:561 g10/sign.c:759
+#: g10/encode.c:576 g10/sign.c:794
 #, 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:738
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2452
+#: g10/export.c:195 g10/keyedit.c:2568 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:217 g10/delkey.c:81 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:222
+#: g10/export.c:226
 #, 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:238
+#: g10/export.c:242
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:246
+#: g10/export.c:250
 #, 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:347
+#. I hope this warning doesn't confuse people.
+#: g10/export.c:395
+#, c-format
+msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
+msgstr ""
+
+#: g10/export.c:427
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:186 g10/getkey.c:2461
+#: g10/getkey.c:187 g10/getkey.c:2590
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1494
+#: g10/getkey.c:1570
 #, 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:2171
+#: g10/getkey.c:2072
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %08lX - ignoring\n"
+msgstr ""
+"Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel \"%s\"!\n"
+
+#: g10/getkey.c:2300
 #, 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:2218
+#: g10/getkey.c:2347
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -2182,186 +2294,191 @@ msgstr "                 unver�nderte geh.Schl.: %lu\n"
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:593 g10/import.c:908
+#: g10/import.c:593
+msgid ""
+"NOTE: Elgamal primary key detected - this may take some time to import\n"
+msgstr ""
+
+#: g10/import.c:607 g10/import.c:926
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:609
-#, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
+#: g10/import.c:626
+#, fuzzy, c-format
+msgid "key %08lX: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %08lX: HKP Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:624
+#: g10/import.c:641
 #, 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:631
+#: g10/import.c:648
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:633
+#: g10/import.c:650
 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:643 g10/import.c:1001
+#: g10/import.c:660 g10/import.c:1019
 #, 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:648
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:657
+#: g10/import.c:674
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:662 g10/openfile.c:244 g10/sign.c:671 g10/sign.c:898
+#: g10/import.c:679 g10/sign.c:701 g10/sign.c:940 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:665 g10/import.c:750 g10/import.c:935 g10/import.c:1061
+#: g10/import.c:682 g10/import.c:768 g10/import.c:953 g10/import.c:1079
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:682
+#: g10/import.c:700
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:704
+#: g10/import.c:722
 #, 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:721 g10/import.c:1018
+#: g10/import.c:739 g10/import.c:1036
 #, 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:728 g10/import.c:1024
+#: g10/import.c:746 g10/import.c:1042
 #, 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:759
+#: g10/import.c:777
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:762
+#: g10/import.c:780
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:765
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:768
+#: g10/import.c:786
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:771
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:774
+#: g10/import.c:792
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:793
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:914
+#: g10/import.c:932
 #, fuzzy, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
 "�bersprungen\n"
 
-#: g10/import.c:929
+#: g10/import.c:947
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:940
+#: g10/import.c:958
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
 #. we can't merge secret keys
-#: g10/import.c:956
+#: g10/import.c:974
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:966
+#: g10/import.c:984
 #, 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:995
+#: g10/import.c:1013
 #, 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:1035
+#: g10/import.c:1053
 #, 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:1067
+#: g10/import.c:1085
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1115
+#: g10/import.c:1149
 #, 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:1128
+#: g10/import.c:1162
 #, 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:1130
+#: g10/import.c:1164
 #, 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:1145
+#: g10/import.c:1179
 #, 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"
 
-#: g10/import.c:1153 g10/import.c:1194
+#: g10/import.c:1187 g10/import.c:1228
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1188
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
@@ -2369,17 +2486,17 @@ msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1166
+#: g10/import.c:1200
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 
-#: g10/import.c:1186 g10/sig-check.c:550
+#: g10/import.c:1220 g10/sig-check.c:552
 #, 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/import.c:1195
+#: g10/import.c:1229
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
@@ -2387,17 +2504,17 @@ msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1206
+#: g10/import.c:1240
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey revocation signatures\n"
 msgstr "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf entfernt\n"
 
-#: g10/import.c:1243
+#: g10/import.c:1279
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1266
+#: g10/import.c:1302
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -2406,139 +2523,145 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:1292
+#: g10/import.c:1328
 #, 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:1301
+#: g10/import.c:1337
 #, 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:1318
+#: g10/import.c:1354
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1330
+#: g10/import.c:1366
 #, 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:1428
+#: g10/import.c:1374
+#, fuzzy, c-format
+msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
+msgstr ""
+"Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
+
+#: g10/import.c:1472
 #, 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:1487
+#: g10/import.c:1531
 #, 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:1501
+#: g10/import.c:1545
 #, 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:1558
+#: g10/import.c:1602
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1589
+#: g10/import.c:1633
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
-#: g10/keyedit.c:151
+#: g10/keyedit.c:153
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:152
+#: g10/keyedit.c:154
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:223 g10/keylist.c:190
+#: g10/keyedit.c:225 g10/keylist.c:191
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:192
+#: g10/keyedit.c:227 g10/keylist.c:193
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:194
+#: g10/keyedit.c:229 g10/keylist.c:195
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:196
+#: g10/keyedit.c:231 g10/keylist.c:197
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:231 g10/keylist.c:198
+#: g10/keyedit.c:233 g10/keylist.c:199
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:233 g10/keylist.c:200
+#: g10/keyedit.c:235 g10/keylist.c:201
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:237
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:237
+#: g10/keyedit.c:239
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:300
+#: g10/keyedit.c:302
 #, fuzzy, c-format
 msgid "   (%d) I trust marginally\n"
 msgstr " %d = Ich vertraue ihm einigerma�en\n"
 
-#: g10/keyedit.c:301
+#: g10/keyedit.c:303
 #, fuzzy, c-format
 msgid "   (%d) I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/keyedit.c:320
+#: g10/keyedit.c:322
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:338
+#: g10/keyedit.c:340
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:481
+#: g10/keyedit.c:483
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:488 g10/keyedit.c:605 g10/keyedit.c:663 g10/keyedit.c:1273
+#: g10/keyedit.c:490 g10/keyedit.c:645 g10/keyedit.c:703 g10/keyedit.c:1315
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:496 g10/keyedit.c:611 g10/keyedit.c:1279
+#: g10/keyedit.c:498 g10/keyedit.c:651 g10/keyedit.c:1321
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
-#: g10/keyedit.c:501
+#: g10/keyedit.c:503
 #, c-format
 msgid "WARNING: user ID \"%s\" is not self-signed.\n"
 msgstr "WARNUNG: User-ID \"%s\" ist nicht eigenbeglaubigt.\n"
 
-#: g10/keyedit.c:520
+#: g10/keyedit.c:522
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2547,13 +2670,27 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:531
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
 
+#: g10/keyedit.c:545
+#, fuzzy, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Die derzeitige Beglaubigung von \"%s\"\n"
+"ist nur f�r diesen Rechner g�ltig.\n"
+
+#: g10/keyedit.c:549
+#, fuzzy
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
+
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:543
+#: g10/keyedit.c:570
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2562,40 +2699,45 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:574
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:567
+#: g10/keyedit.c:595
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:571
+#: g10/keyedit.c:599
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:604
+#, fuzzy
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
+
+#: g10/keyedit.c:624
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:639
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:619
+#: g10/keyedit.c:659
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:663
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:696
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2603,11 +2745,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:658
+#: g10/keyedit.c:698
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies w�rde den Schl�ssel f�r PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:723
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2617,27 +2759,27 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:688
+#: g10/keyedit.c:728
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:690
+#: g10/keyedit.c:730
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
 
-#: g10/keyedit.c:692
+#: g10/keyedit.c:732
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es fl�chtig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:694
+#: g10/keyedit.c:734
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:723
+#: g10/keyedit.c:763
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2645,7 +2787,7 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:772
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2653,7 +2795,7 @@ msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:776
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2662,7 +2804,7 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:741
+#: g10/keyedit.c:781
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2670,7 +2812,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:788
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2678,7 +2820,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:792
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2686,7 +2828,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:797
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2694,7 +2836,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:761
+#: g10/keyedit.c:801
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2702,7 +2844,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:765
+#: g10/keyedit.c:805
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2710,33 +2852,34 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:814
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:819 g10/keyedit.c:3263 g10/keyedit.c:3325 g10/sign.c:308
+#: g10/keyedit.c:859 g10/keyedit.c:3376 g10/keyedit.c:3467 g10/keyedit.c:3540
+#: g10/sign.c:309
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:915
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:879
+#: g10/keyedit.c:919
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:923
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:943
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:949
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2744,7 +2887,7 @@ msgstr ""
 "Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:923
+#: g10/keyedit.c:963
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2752,475 +2895,522 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:966
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:990
+#: g10/keyedit.c:1030
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1032
+#: g10/keyedit.c:1072
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:1033
+#: g10/keyedit.c:1073
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:1034
+#: g10/keyedit.c:1074
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:1034
+#: g10/keyedit.c:1074
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:1035
+#: g10/keyedit.c:1075
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:1035
+#: g10/keyedit.c:1075
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:1037
+#: g10/keyedit.c:1077
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:1037
+#: g10/keyedit.c:1077
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1038
+#: g10/keyedit.c:1078
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:1038
+#: g10/keyedit.c:1078
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1039
+#: g10/keyedit.c:1079
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:1040
+#: g10/keyedit.c:1080
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:1040
+#: g10/keyedit.c:1080
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1041
+#: g10/keyedit.c:1081
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:1041
+#: g10/keyedit.c:1081
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1082
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1082
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:1043
+#: g10/keyedit.c:1083
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:1044
+#: g10/keyedit.c:1084
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:1044
+#: g10/keyedit.c:1084
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:1045
+#: g10/keyedit.c:1085
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:1046
+#: g10/keyedit.c:1086
 #, fuzzy
 msgid "tsign"
 msgstr "sign"
 
-#: g10/keyedit.c:1046
+#: g10/keyedit.c:1086
 #, fuzzy
 msgid "make a trust signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1087
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1087
 msgid "sign the key locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1048
+#: g10/keyedit.c:1088
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:1048
+#: g10/keyedit.c:1088
 msgid "sign the key non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar beglaubigen"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1089
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1089
 msgid "sign the key locally and non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar und nur f�r diesen Rechner signieren"
 
-#: g10/keyedit.c:1050
+#: g10/keyedit.c:1090
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:1051
+#: g10/keyedit.c:1091
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:1051
+#: g10/keyedit.c:1091
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1092
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1092
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:1053
+#: g10/keyedit.c:1093
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:1053
+#: g10/keyedit.c:1093
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:1055
+#: g10/keyedit.c:1095
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:1056
+#: g10/keyedit.c:1096
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1056
+#: g10/keyedit.c:1096
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1057
+#: g10/keyedit.c:1097
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:1057
+#: g10/keyedit.c:1097
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:1058
+#: g10/keyedit.c:1098
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:1058
+#: g10/keyedit.c:1098
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1059
+#: g10/keyedit.c:1099
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:1059
+#: g10/keyedit.c:1099
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1100
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1100
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:1061
+#: g10/keyedit.c:1101
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:1061
+#: g10/keyedit.c:1101
 msgid "flag user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1062
+#: g10/keyedit.c:1102
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:1062
+#: g10/keyedit.c:1102
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1104
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:1065
+#: g10/keyedit.c:1105
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:1065
+#: g10/keyedit.c:1105
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1106
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1106
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1107
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1107
 msgid "set preference list"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1108
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1108
 msgid "updated preferences"
 msgstr "ge�nderte Voreinstellungen"
 
-#: g10/keyedit.c:1069
+#: g10/keyedit.c:1109
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:1069
+#: g10/keyedit.c:1109
 msgid "change the passphrase"
 msgstr "Das Mantra �ndern"
 
-#: g10/keyedit.c:1070
+#: g10/keyedit.c:1110
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:1070
+#: g10/keyedit.c:1110
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:1071
+#: g10/keyedit.c:1111
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:1071
+#: g10/keyedit.c:1111
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1072
+#: g10/keyedit.c:1112
+#, fuzzy
+msgid "revuid"
+msgstr "revsig"
+
+#: g10/keyedit.c:1112
+#, fuzzy
+msgid "revoke a user ID"
+msgstr "Eine User-ID hinzuf�gen"
+
+#: g10/keyedit.c:1113
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:1072
+#: g10/keyedit.c:1113
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:1073
+#: g10/keyedit.c:1114
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:1073
+#: g10/keyedit.c:1114
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1115
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1115
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:1075
+#: g10/keyedit.c:1116
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:1075
+#: g10/keyedit.c:1116
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/delkey.c:119 g10/keyedit.c:1095
+#: g10/keyedit.c:1136 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1174
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1192
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1223
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:1213
+#: g10/keyedit.c:1255
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1217
+#: g10/keyedit.c:1259
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1309
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1328
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1329
 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:1313
+#: g10/keyedit.c:1355
 #, 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:1333 g10/keyedit.c:1354
+#: g10/keyedit.c:1375 g10/keyedit.c:1396 g10/keyedit.c:1456
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1335
+#: g10/keyedit.c:1377
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1338
+#: g10/keyedit.c:1380
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1381
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1377 g10/keyedit.c:1414
+#: g10/keyedit.c:1419 g10/keyedit.c:1475
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1423
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1424
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1459
+#, fuzzy
+msgid "Really revoke all selected user IDs? "
+msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
+
+#: g10/keyedit.c:1460
+#, fuzzy
+msgid "Really revoke this user ID? "
+msgstr "Diese User-ID wirklich entfernen? "
+
+#: g10/keyedit.c:1479
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1480
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1544
 #, fuzzy
 msgid "Current preference list:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1550
 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:1491
+#: g10/keyedit.c:1552
 msgid "Really update the preferences? "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1529
+#: g10/keyedit.c:1590
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1532
+#: g10/keyedit.c:1593
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1543
+#: g10/keyedit.c:1604
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1611
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1618
 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:1569
+#: g10/keyedit.c:1630
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1885
+#: g10/keyedit.c:1689
+msgid "Digest: "
+msgstr ""
+
+#: g10/keyedit.c:1741
+msgid "Features: "
+msgstr ""
+
+#: g10/keyedit.c:1752
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:1993
 #, 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:1889
+#: g10/keyedit.c:1997
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1895 g10/keyedit.c:1921 g10/keyedit.c:2006 g10/keyedit.c:2021
+#: g10/keyedit.c:2003 g10/keyedit.c:2037 g10/keyedit.c:2122 g10/keyedit.c:2137
 #, 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:1904
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2016
+#, fuzzy, c-format
+msgid "trust: %-13s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1908
+#: g10/keyedit.c:2017
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2023
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:1937
+#: g10/keyedit.c:2053
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:2056
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1942
+#: g10/keyedit.c:2058
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:2078
+#, fuzzy
+msgid "[revoked] "
+msgstr "revkey"
+
+#: g10/keyedit.c:2080
+#, fuzzy
+msgid "[expired] "
+msgstr "expire"
+
+#: g10/keyedit.c:2088
 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:1980
+#: g10/keyedit.c:2096
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3228,7 +3418,7 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2137
+#: g10/keyedit.c:2253
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3238,45 +3428,45 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2142 g10/keyedit.c:2415
+#: g10/keyedit.c:2258 g10/keyedit.c:2531
 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:2148
+#: g10/keyedit.c:2264
 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:2283
+#: g10/keyedit.c:2399
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2293
+#: g10/keyedit.c:2409
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2297
+#: g10/keyedit.c:2413
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2303
+#: g10/keyedit.c:2419
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2317
+#: g10/keyedit.c:2433
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2318
+#: g10/keyedit.c:2434
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2321
+#: g10/keyedit.c:2437
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2526
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3287,16 +3477,16 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2421
+#: g10/keyedit.c:2537
 #, fuzzy
 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 keine Foto-ID hinzuf�gen.\n"
 
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2560
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2459
+#: g10/keyedit.c:2575
 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 "
@@ -3305,65 +3495,78 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2474
+#: g10/keyedit.c:2590
 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:2496
+#: g10/keyedit.c:2612
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "Ein Schl�ssel kann nicht als sein eigener designierter Widerrufer agieren\n"
 
-#: g10/keyedit.c:2592
+#: g10/keyedit.c:2641
+#, fuzzy
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"Ein Schl�ssel kann nicht als sein eigener designierter Widerrufer agieren\n"
+
+#: g10/keyedit.c:2647
+#, fuzzy
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Ein Schl�ssel kann nicht als sein eigener designierter Widerrufer agieren\n"
+
+#: g10/keyedit.c:2708
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:2598
+#: g10/keyedit.c:2714
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:2602
+#: g10/keyedit.c:2718
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:2604
+#: g10/keyedit.c:2720
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2762
 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:2662
+#: g10/keyedit.c:2778
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2858
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:2782 g10/keyedit.c:2889
+#: g10/keyedit.c:2895 g10/keyedit.c:3002
 #, 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:2949
+#: g10/keyedit.c:3062
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:2995
+#: g10/keyedit.c:3108
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3222
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3114
+#: g10/keyedit.c:3227
 #, c-format
 msgid ""
 "\"\n"
@@ -3372,7 +3575,7 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3230
 #, c-format
 msgid ""
 "\"\n"
@@ -3381,113 +3584,127 @@ msgstr ""
 "\"\n"
 "lokal unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3122
+#: g10/keyedit.c:3235
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3239
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3130
+#: g10/keyedit.c:3243
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3155
+#: g10/keyedit.c:3268
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3287
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3295
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3202
+#: g10/keyedit.c:3315
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3212
+#: g10/keyedit.c:3325
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3327
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3221
+#: g10/keyedit.c:3334
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3364
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3434
+#, fuzzy, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#. Okay, this is a problem.  The user ID selfsig was
+#. created in the future, so we need to warn the user and
+#. set our revocation timestamp one second after that so
+#. everything comes out clean.
+#: g10/keyedit.c:3451
+#, fuzzy, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
+
+#: g10/keyedit.c:3624
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
 "Anzeigen einer %s Photo ID (%ld Byte) f�r Schl�ssel %08lX (User-ID %d)\n"
 
-#: g10/keylist.c:133
+#: g10/keylist.c:134
 msgid "Critical signature policy: "
 msgstr "Krititische Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:135
+#: g10/keylist.c:136
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:160 g10/keylist.c:183 g10/mainproc.c:769 g10/mainproc.c:778
+#: g10/keylist.c:161 g10/keylist.c:184 g10/mainproc.c:769 g10/mainproc.c:778
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/keylist.c:169
+#: g10/keylist.c:170
 msgid "Critical signature notation: "
 msgstr "Krititische Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:171
+#: g10/keylist.c:172
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:178
+#: g10/keylist.c:179
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/keylist.c:267
+#: g10/keylist.c:268
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
 #. of subkey
-#: g10/keylist.c:536 g10/mainproc.c:905
+#: g10/keylist.c:545 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/keylist.c:1063
+#: g10/keylist.c:1083
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1065
+#: g10/keylist.c:1085
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1072
+#: g10/keylist.c:1092
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1074
+#: g10/keylist.c:1094
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
 #. use tty
-#: g10/keylist.c:1078 g10/keylist.c:1082
+#: g10/keylist.c:1098 g10/keylist.c:1102
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Schl.-Fingerabdruck ="
@@ -3502,12 +3719,12 @@ msgstr "Seltsame L�nge des verschl�sselten Session-Keys (%d)\n"
 msgid "invalid symkey algorithm detected (%d)\n"
 msgstr "Ung�ltiger Veschl�sselungsalgorithmus entdeckt (%d)\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:288
+#: g10/mainproc.c:288 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschl�sselte Daten\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:290
+#: g10/mainproc.c:290 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
@@ -3552,6 +3769,11 @@ msgstr "IDEA-Verschl�sselung nicht verf�gbar; versucht wird stattdessen %s\n"
 msgid "decryption okay\n"
 msgstr "Entschl�sselung erfolgreich\n"
 
+#: g10/mainproc.c:508
+#, fuzzy
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNUNG: Nichts exportiert\n"
+
 #: g10/mainproc.c:511
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
@@ -3584,56 +3806,85 @@ msgstr "\"Notation\": "
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1248
+#: g10/mainproc.c:1258
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1290 g10/mainproc.c:1300
+#: g10/mainproc.c:1300 g10/mainproc.c:1310
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1319
 #, 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:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1368 g10/mainproc.c:1401
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1369 g10/mainproc.c:1402
 msgid "Expired signature from \""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1370 g10/mainproc.c:1403
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1405
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1504
+#, fuzzy, c-format
+msgid "Signature expired %s\n"
+msgstr "Diese Unterschrift ist seit %s verfallen.\n"
+
+#: g10/mainproc.c:1509
+#, fuzzy, c-format
+msgid "Signature expires %s\n"
+msgstr "Diese Unterschrift ist seit %s verfallen.\n"
+
+#: g10/mainproc.c:1512
+#, fuzzy, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s Unterschrift von: \"%s\"\n"
+
+#: g10/mainproc.c:1513
+#, fuzzy
+msgid "binary"
+msgstr "primary"
+
+#: g10/mainproc.c:1514
+msgid "textmode"
+msgstr ""
+
+#: g10/mainproc.c:1514 g10/trustdb.c:496
+#, fuzzy
+msgid "unknown"
+msgstr "Unbekannte Version"
+
+#: g10/mainproc.c:1534
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1558 g10/mainproc.c:1574 g10/mainproc.c:1636
+#: g10/mainproc.c:1603 g10/mainproc.c:1619 g10/mainproc.c:1681
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1630
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1642
+#: g10/mainproc.c:1687
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1649
+#: g10/mainproc.c:1694
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -3650,85 +3901,90 @@ msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 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:300
+#: g10/misc.c:301
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschl�sselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:302
 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:509
+#: g10/misc.c:511
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mi�billigte Option \"%s\".\n"
 
-#: g10/misc.c:513
+#: g10/misc.c:515
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mi�billigte Option.\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:517
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:639
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:1072
+#: g10/parse-packet.c:1066
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:456 g10/passphrase.c:503
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:464
 msgid "can't set client pid for the agent\n"
 msgstr "Client-PID f�r den Agent kann nicht gesetzt werden\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:472
 msgid "can't get server read FD for the agent\n"
 msgstr "Server-Lese-Handle f�r den Agent nicht verf�gbar\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:479
 msgid "can't get server write FD for the agent\n"
 msgstr "Server-Schreib-Handle f�r den Agent nicht verf�gbar\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:512
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:525
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
 
-#: g10/passphrase.c:532
+#: g10/passphrase.c:546
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:568
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:812 g10/passphrase.c:920
+#: g10/passphrase.c:575 g10/passphrase.c:875 g10/passphrase.c:987
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1019
+#: g10/passphrase.c:676 g10/passphrase.c:1091
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:686
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3739,32 +3995,32 @@ msgstr ""
 "Benutzer: \"\"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %08lX, erzeugt %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Geben Sie das Mantra ein\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:708
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie das Mantra nochmal ein\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:710
+msgid "Enter passphrase\n"
+msgstr "Geben Sie das Mantra ein\n"
+
+#: g10/passphrase.c:748
 msgid "passphrase too long\n"
 msgstr "Mantra ist zu lang\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:761
 msgid "invalid response from agent\n"
 msgstr "Falsche Antwort des Agenten\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:809
+#: g10/passphrase.c:776 g10/passphrase.c:869
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:891
+#: g10/passphrase.c:781 g10/passphrase.c:958
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:1005
+#: g10/passphrase.c:1077
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3774,20 +4030,20 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:1014
+#: g10/passphrase.c:1086
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:1065
+#: g10/passphrase.c:1138
 msgid "can't query password in batchmode\n"
 msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:1069
+#: g10/passphrase.c:1142
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:1073
+#: g10/passphrase.c:1146
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -3796,28 +4052,28 @@ 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:125
+#: g10/plaintext.c:112 g10/plaintext.c:127
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:369
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:366
+#: g10/plaintext.c:373
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:387
+#: g10/plaintext.c:394
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:421
+#: g10/plaintext.c:428
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:429
+#: g10/plaintext.c:436
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -3854,31 +4110,31 @@ msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schl�ssel wurde widerrufen"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schl�ssels sind nicht vorhanden\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "Schutzverfahren %d%s wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:234
+#: g10/seckey-cert.c:243
 msgid "Invalid passphrase; please try again"
 msgstr "Ung�ltiges Mantra; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:235
+#: g10/seckey-cert.c:244
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:292
+#: g10/seckey-cert.c:301
 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:330
+#: g10/seckey-cert.c:339
 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 "
@@ -3940,14 +4196,14 @@ msgstr ""
 "Vermutlich eine FALSCHE Unterschrift von Schl�ssel %08lX, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sign.c:103
+#: g10/sign.c:104
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu gro�). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:151
+#: g10/sign.c:152
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -3955,49 +4211,49 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:304
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:312
-#, c-format
-msgid "%s signature from: \"%s\"\n"
+#: g10/sign.c:313
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:462
+#: g10/sign.c:489
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/sign.c:645
+#: g10/sign.c:672
 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:666 g10/sign.c:893
+#: g10/sign.c:696 g10/sign.c:935
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:691
+#: g10/sign.c:725
 #, 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:785
+#: g10/sign.c:820
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:877
+#: g10/sign.c:919
 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:1030
+#: g10/sign.c:1072
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
@@ -4012,12 +4268,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:1389
+#: g10/tdbio.c:128 g10/tdbio.c:1433
 #, 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:1396
+#: g10/tdbio.c:134 g10/tdbio.c:1440
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
@@ -4026,138 +4282,138 @@ msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu gro�\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:495
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: kann nicht zugegriffen werden: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:520 g10/tdbio.c:538 g10/tdbio.c:581
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:522 g10/tdbio.c:584
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
 
-#: g10/keyring.c:1453 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:528 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1463
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:543
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:547
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ung�ltige trust-db erzeugt\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:590
 msgid "NOTE: trustdb not writable\n"
 msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:606
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ung�ltige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:638
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:646
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1322 g10/tdbio.c:1349
+#: g10/tdbio.c:663 g10/tdbio.c:683 g10/tdbio.c:699 g10/tdbio.c:713
+#: g10/tdbio.c:743 g10/tdbio.c:1366 g10/tdbio.c:1393
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:722
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1162
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1170
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1191
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1209
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1355
+#: g10/tdbio.c:1399
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1363
+#: g10/tdbio.c:1407
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1373
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1403
+#: g10/tdbio.c:1447
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/tdbio.c:1448
+#: g10/tdbio.c:1492
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/trustdb.c:213
+#: g10/trustdb.c:214
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine g�ltige lange Schl�ssel-ID\n"
 
-#: g10/trustdb.c:248
+#: g10/trustdb.c:249
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel\n"
 
-#: g10/trustdb.c:286
+#: g10/trustdb.c:287
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "Schl�ssel %08lX tritt mehr als einmal in der \"trustdb\" auf\n"
@@ -4184,90 +4440,123 @@ msgstr "trust record %lu, req type %d: read failed: %s\n"
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:358
+#: g10/trustdb.c:358 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
 
-#: g10/trustdb.c:373
+#: g10/trustdb.c:373 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:463
-#, fuzzy
-msgid "unknown trust"
-msgstr "Unbekannte Version"
+#: g10/trustdb.c:448
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
 
-#: g10/trustdb.c:464
+#: g10/trustdb.c:454
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:497
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/trustdb.c:465
-msgid "undefined trust"
+#: g10/trustdb.c:498
+msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:466
-#, fuzzy
-msgid "do NOT trust"
-msgstr " %d = Nein, ihm traue ich NICHT\n"
+#: g10/trustdb.c:499
+msgid "never"
+msgstr ""
 
-#: g10/trustdb.c:467
-msgid "marginal trust"
+#: g10/trustdb.c:500
+msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:468
-#, fuzzy
-msgid "full trust"
-msgstr "trust"
+#: g10/trustdb.c:501
+msgid "full"
+msgstr ""
 
-#: g10/trustdb.c:469
+#: g10/trustdb.c:502
 #, fuzzy
-msgid "ultimate trust"
+msgid "ultimate"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:542
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:510 g10/trustdb.c:1912
+#: g10/trustdb.c:548 g10/trustdb.c:2113
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
-#: g10/trustdb.c:519
+#: g10/trustdb.c:557
 #, fuzzy, c-format
 msgid "no need for a trustdb check with \"%s\" trust model\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:572
 #, fuzzy, c-format
 msgid "no need for a trustdb update with \"%s\" trust model\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:708 g10/trustdb.c:1073
+#: g10/trustdb.c:767 g10/trustdb.c:1230
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:919
+#: g10/trustdb.c:1019
+msgid "please do a --check-trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:1023
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
-#: g10/trustdb.c:1748
+#: g10/trustdb.c:1132
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
+#: g10/trustdb.c:1866
+#, fuzzy, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%lu Schl�ssel bislang bearbeitet\n"
+
+#: g10/trustdb.c:1920
+#, 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:1938
 #, 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:1854
+#: g10/trustdb.c:1961
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2044
+#, fuzzy, c-format
+msgid "checking at depth %d valid=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
 "�berpr�fen, Tiefe %d, unterschrieben =%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2119
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "trust record %lu, type %d: write failed: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4277,7 +4566,7 @@ msgstr ""
 "Denken Sie daran, da� die Datei mit der Unterschrift (.sig oder .asc)\n"
 "als erster in der Kommandozeile stehen sollte.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
@@ -4330,26 +4619,31 @@ msgstr "%s: unbekannte Dateinamenerweiterung\n"
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:326
+#: g10/openfile.c:349
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
@@ -4805,59 +5099,343 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
-#: g10/keydb.c:182
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
 
-#: g10/keydb.c:189
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "Schl�sselbund `%s' erstellt\n"
 
-#: g10/keydb.c:608
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyring.c:1231
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/keyring.c:1233
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/keyring.c:1234
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/keyring.c:1235
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/keyring.c:1351
+#: g10/keyring.c:1360
 #, c-format
 msgid "checking keyring `%s'\n"
 msgstr "Pr�fen des Schl�sselbundes `%s'\n"
 
-#: g10/keyring.c:1382
+#: g10/keyring.c:1391
 #, fuzzy, c-format
 msgid "%lu keys checked so far (%lu signatures)\n"
 msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1393
+#: g10/keyring.c:1402
 #, c-format
 msgid "%lu keys checked (%lu signatures)\n"
 msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1458
+#: g10/keyring.c:1468
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
+#: g10/photoid.c:65
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr ""
+
+#: g10/photoid.c:87
+#, fuzzy, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+
+#: g10/photoid.c:97
+#, fuzzy
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
+
+#: g10/photoid.c:112
+#, fuzzy, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "%s: keine trustdb Datei\n"
+
+#: g10/photoid.c:129
+#, fuzzy
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Ist dies richtig? (j/n) "
+
+#: g10/photoid.c:331
+#, fuzzy
+msgid "unable to display photo ID!\n"
+msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr ""
+
+#: g10/exec.c:184
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+
+#. If we get this far the exec failed.  Clean up and return.
+#: g10/exec.c:432
+#, fuzzy, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+
+#: g10/exec.c:513
+#, fuzzy, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr ""
+
+#: g10/exec.c:539
+#, fuzzy
+msgid "unable to execute external program\n"
+msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+
+#: g10/exec.c:548
+#, fuzzy, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr ""
+
+#: g10/keyid.c:332 g10/keyid.c:344 g10/keyid.c:356
+msgid "never     "
+msgstr ""
+
+#: g10/revoke.c:92
+msgid "key incomplete\n"
+msgstr ""
+
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:540
+#, fuzzy, c-format
+msgid "build_packet failed: %s\n"
+msgstr "�nderung fehlgeschlagen: %s\n"
+
+#: g10/revoke.c:145
+#, fuzzy, c-format
+msgid "key %08lX incomplete\n"
+msgstr "Schl�ssel %08lX: Keine User-ID\n"
+
+#: g10/revoke.c:214 g10/revoke.c:414
+#, fuzzy
+msgid "sorry, can't do this in batch mode\n"
+msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
+
+#: g10/revoke.c:270
+msgid "To be revoked by:\n"
+msgstr ""
+
+#: g10/revoke.c:274
+msgid "(This is a sensitive revocation key)\n"
+msgstr ""
+
+#: g10/revoke.c:278 g10/revoke.c:475
+#, fuzzy
+msgid "Create a revocation certificate for this key? "
+msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
+
+#: g10/revoke.c:291 g10/revoke.c:506
+msgid "ASCII armored output forced.\n"
+msgstr ""
+
+#: g10/revoke.c:305 g10/revoke.c:520
+#, fuzzy, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
+
+#. and issue a usage notice
+#: g10/revoke.c:368
+#, fuzzy
+msgid "Revocation certificate created.\n"
+msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
+
+#: g10/revoke.c:374
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
+
+#: g10/revoke.c:428
+#, fuzzy, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
+
+#: g10/revoke.c:457
+#, fuzzy, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
+
+#: g10/revoke.c:468
+msgid "public key does not match secret key!\n"
+msgstr ""
+
+#: g10/revoke.c:491
+#, fuzzy
+msgid "unknown protection algorithm\n"
+msgstr "Unbekanntes Komprimierverfahren"
+
+#: g10/revoke.c:495
+#, fuzzy
+msgid "NOTE: This key is not protected!\n"
+msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
+
+#. and issue a usage notice
+#: g10/revoke.c:546
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+
+#: g10/revoke.c:587
+#, fuzzy
+msgid "Please select the reason for the revocation:\n"
+msgstr "Grund f�r Widerruf: "
+
+#: g10/revoke.c:597
+msgid "Cancel"
+msgstr ""
+
+#: g10/revoke.c:599
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr ""
+
+#: g10/revoke.c:640
+#, fuzzy
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+"\n"
+"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
+
+#: g10/revoke.c:668
+#, fuzzy, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Grund f�r Widerruf: "
+
+#: g10/revoke.c:670
+msgid "(No description given)\n"
+msgstr ""
+
+#: g10/revoke.c:675
+#, fuzzy
+msgid "Is this okay? "
+msgstr "Diesen Schl�ssel trotzdem benutzen? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+
+#: g10/tdbdump.c:140
+#, fuzzy, c-format
+msgid "can't open file: %s\n"
+msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
+
+#: g10/tdbdump.c:151
+#, fuzzy
+msgid "line too long\n"
+msgstr "Mantra ist zu lang\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr ""
+
+#: g10/tdbdump.c:164
+#, fuzzy
+msgid "error: invalid fingerprint\n"
+msgstr "%s: invalid file version %d\n"
+
+#: g10/tdbdump.c:168
+#, fuzzy
+msgid "error: no ownertrust value\n"
+msgstr "Exportieren der \"Owner trust\"-Werte"
+
+#. error
+#: g10/tdbdump.c:204
+#, fuzzy, c-format
+msgid "error finding trust record: %s\n"
+msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
+
+#: g10/tdbdump.c:208
+#, fuzzy, c-format
+msgid "read error: %s\n"
+msgstr "ASCII-H�lle: %s\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Es ist nicht sicher, da� dieser Schl�ssel wirklich dem "
+#~ "vorgeblichen\n"
+#~ "Besitzer geh�rt, aber er wird trotzdem akzeptiert\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr ""
+#~ "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
+
+#, fuzzy
+#~ msgid "do NOT trust"
+#~ msgstr " %d = Nein, ihm traue ich NICHT\n"
+
+#, fuzzy
+#~ msgid "full trust"
+#~ msgstr "trust"
+
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "Voreinstellung %c%lu ist nicht g�ltig\n"
 
@@ -5064,9 +5642,6 @@ msgstr "%s: Schl�sselbund erstellt\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "Fehler beim Lesen den Hauptschl�ssels der LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "Schl�ssel %08lX: Satzabfrage fehlgeschlagen\n"
 
@@ -5081,9 +5656,6 @@ msgstr "%s: Schl�sselbund erstellt\n"
 #~ "Schl�ssel %08lX: geheimer und �ffentlicher Schl�ssel passen nicht "
 #~ "zusammen.\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "enum_secret_keys fehlgeschlagen: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "Schl�ssel %08lX.%lu: Korrekte Unterschl�ssel-Anbindung\n"
 
@@ -5143,15 +5715,9 @@ msgstr "%s: Schl�sselbund erstellt\n"
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: eingef�gt\n"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
-
 #~ msgid "\t%lu keys inserted\n"
 #~ msgstr "\t%lu Schl�ssel eingef�gt\n"
 
-#~ msgid "enumerate keyblocks failed: %s\n"
-#~ msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
-
 #~ msgid "lid %lu: dir record w/o key - skipped\n"
 #~ msgstr "lid %lu: Dir-Satz ohne Schl�ssel - �bergangen\n"